git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a47dc1 79dba2e)
Merge branch 'master' into for-2.6.35
authorJens Axboe <jens.axboe@oracle.com>
Thu, 29 Apr 2010 07:36:24 +0000 (09:36 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 29 Apr 2010 07:36:24 +0000 (09:36 +0200)
Conflicts:
fs/block_dev.c

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

Trivial merge
Pandora Kernel Repository