]> git.hungrycats.org Git - linux/commitdiff
Merge
authorLinus Torvalds <torvalds@home.transmeta.com>
Sun, 12 Jan 2003 03:50:08 +0000 (19:50 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Sun, 12 Jan 2003 03:50:08 +0000 (19:50 -0800)
1  2 
drivers/pnp/isapnp/core.c

Simple merge