From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 13 Jul 2006 04:19:06 +0000 (-0700)
Subject: Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 of HEAD
X-Git-Tag: v2.6.18-rc2~95
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2513eb8e67a2483aecb5bf7fead7692d5aabbdcd;p=linux-2.6

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

2513eb8e67a2483aecb5bf7fead7692d5aabbdcd