Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
commit3b762d321a5e73d3a892a13f0c84dc1d3d50e928
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 19 Nov 2005 23:24:42 +0000 (19 15:24 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 19 Nov 2005 23:24:42 +0000 (19 15:24 -0800)
tree84239bfcf3682352d7cebc2a118184092419acf7
parent29ac878a71d1900cc2e283819b1daa388961ab6e
parent20913a9f6e3ae9a7facf96c7b1299e3875a895a0
Merge kernel.org:/home/rmk/linux-2.6-drvmodel

Manual fixups to ARM ixp4xxx by hand.