git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 150e6c6 4b27e1b)
Merge branch 'for-linus' into for-2.6.33
authorJens Axboe <jens.axboe@oracle.com>
Tue, 3 Nov 2009 20:14:39 +0000 (21:14 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 3 Nov 2009 20:14:39 +0000 (21:14 +0100)
Conflicts:
block/cfq-iosched.c

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

Trivial merge
Pandora Kernel Repository