git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4b6363 6a44587)
Merge branch 'master' into for-2.6.31
authorJens Axboe <jens.axboe@oracle.com>
Fri, 22 May 2009 18:28:35 +0000 (20:28 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Fri, 22 May 2009 18:28:35 +0000 (20:28 +0200)
Conflicts:
drivers/ide/ide-io.c

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

Trivial merge
Pandora Kernel Repository