git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9ce335 a3d3203)
Merge branch 'master' into for-linus
authorJens Axboe <jens.axboe@oracle.com>
Fri, 19 Mar 2010 07:05:10 +0000 (08:05 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Fri, 19 Mar 2010 07:05:10 +0000 (08:05 +0100)
Conflicts:
block/Kconfig

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

Trivial merge
Pandora Kernel Repository