git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cafb0bf 69d60eb)
Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
authorJens Axboe <jaxboe@fusionio.com>
Thu, 10 Mar 2011 07:58:35 +0000 (08:58 +0100)
committerJens Axboe <jaxboe@fusionio.com>
Thu, 10 Mar 2011 07:58:35 +0000 (08:58 +0100)
Conflicts:
block/blk-core.c
block/blk-flush.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
fs/nilfs2/btnode.c
fs/nilfs2/mdt.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

Trivial merge
Pandora Kernel Repository