Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 of HEAD
commit2513eb8e67a2483aecb5bf7fead7692d5aabbdcd
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Jul 2006 04:19:06 +0000 (12 21:19 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Jul 2006 04:19:06 +0000 (12 21:19 -0700)
tree4969e9e0ae8a35553ef985af455e98beb86e2ed4
parentd3745f46e32d86de188cf378f923b7a2ed5274f9
parentcd6ef2ada54aa4788d5a3dee3cffaad41383a52a
Merge commit /linux/kernel/git/gregkh/driver-2.6 of HEAD

* HEAD:
  [PATCH] The scheduled unexport of insert_resource
  [PATCH] remove kernel/power/pm.c:pm_unregister_all()
  [PATCH] Driver core: bus.c cleanups
  [PATCH] Driver core: kernel-doc in drivers/base/core.c corrections
  [PATCH] Driver core: fix driver-core kernel-doc