projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1af9be a73ff32)
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
authorJens Axboe <axboe@kernel.dk>
Mon, 30 Jul 2012 07:03:10 +0000 (09:03 +0200)
committerJens Axboe <axboe@kernel.dk>
Mon, 30 Jul 2012 07:03:10 +0000 (09:03 +0200)
1  2 
drivers/block/floppy.c patch | diff1 | diff2 | blob | history

diff --cc drivers/block/floppy.c
Simple merge
Domain: System / Kernel;