projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a051661 0cc15d0)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy...
authorJens Axboe <axboe@kernel.dk>
Tue, 24 Jul 2012 11:15:08 +0000 (13:15 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 24 Jul 2012 11:15:08 +0000 (13:15 +0200)

Trivial merge