Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 31 Oct 2005 15:32:56 +0000 (07:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 31 Oct 2005 15:32:56 +0000 (07:32 -0800)
Manual #include fixups for clashes - there may be some unnecessary


Trivial merge