Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 12 Nov 2005 00:29:22 +0000 (16:29 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 12 Nov 2005 00:29:22 +0000 (16:29 -0800)
commit63f45b80947cb0819673860f6970f483e2cab21d
tree6b0d46c7da70786c15ee893d8a48aa866ae3742c
parent85837ebdd7bb3e96a60e9b4c6af6c60d1273bc67
parentb2d1a8adc9cf3bde32a18a1a1856641638a9c729
Merge git://git./linux/kernel/git/bunk/trivial
MAINTAINERS
drivers/block/floppy.c