Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 9 Jun 2007 01:11:47 +0000 (18:11 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 9 Jun 2007 01:11:47 +0000 (18:11 -0700)
commit837525e344298335ea56c3b8c9ca7abbc97f0285
treee7afd356670edab6f3550fa9cc0eb9c926b590df
parent217397d7d267f832081169016e1ab66691a13e08
parent87d37a4f470834223fc8a243af002998bdb5b886
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  firmware: remove orphaned Email
  kobject: use the proper printk level for kobject error
  Driver core: kill unused code
  Driver core: keep PHYSDEV for old struct class_device
  update Documentation/driver-model/platform.txt