A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into for-2.6.35

Browse source 
Conflicts:
	block/blk-cgroup.c
	block/cfq-iosched.c

Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
Jens Axboe 2010-04-13 20:03:21 +02:00
commit 4facdaec1c
4562 changed files with 26269 additions and 5537 deletions
Download patch file Download diff file Expand all files Collapse all files

1
block/blk-cgroup.c
View file

@ -16,6 +16,7 @@
#include <linux/module.h>
#include <linux/err.h>
#include <linux/blkdev.h>
#include <linux/slab.h>
#include "blk-cgroup.h"
#include <linux/genhd.h>