tree e7afd356670edab6f3550fa9cc0eb9c926b590df
parent 217397d7d267f832081169016e1ab66691a13e08
parent 87d37a4f470834223fc8a243af002998bdb5b886
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1181351507 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1181351507 -0700

Merge master.kernel.org:/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