]> err.no Git - linux-2.6/commitdiff
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 19 Nov 2005 23:24:42 +0000 (15:24 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 19 Nov 2005 23:24:42 +0000 (15:24 -0800)
Manual fixups to ARM ixp4xxx by hand.


Trivial merge