]> git.hungrycats.org Git - linux/commitdiff
Merge http://gkernel.bkbits.net/misc-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Wed, 1 May 2002 03:28:52 +0000 (20:28 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Wed, 1 May 2002 03:28:52 +0000 (20:28 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
drivers/mtd/mtdblock_ro.c

Simple merge