projects / GitHub / mt8127 / android_kernel_alcatel_ttab.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74018dc 2fb2ca6)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy...
authorJens Axboe <axboe@kernel.dk>
Tue, 31 Jul 2012 09:47:36 +0000 (11:47 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 31 Jul 2012 09:47:36 +0000 (11:47 +0200)
1  2 
drivers/block/floppy.c patch | diff1 | diff2 | blob | history

diff --cc drivers/block/floppy.c
Simple merge
kernel source for telekom puls (alcatel/mediatek)