git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a11cdaa 0d0fb0f)
Merge branch 'master' into for-2.6.35
authorJens Axboe <jens.axboe@oracle.com>
Tue, 13 Apr 2010 18:03:21 +0000 (20:03 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 13 Apr 2010 18:03:21 +0000 (20:03 +0200)
Conflicts:
block/blk-cgroup.c
block/cfq-iosched.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

Trivial merge
Pandora Kernel Repository