tree 50774592eaba942cf378fca731d307f901b737b7
parent eb16292ba8a6655a560ab10a7d73a7816f0c0ac0
parent 8576762ff5d109b841fcf4e7d3883e0cf794f3cf
author Linus Torvalds <torvalds@g5.osdl.org> 1130772776 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1130772776 -0800

Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel

Manual #include fixups for clashes - there may be some unnecessary