From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 30 Jul 2007 23:35:35 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
X-Git-Tag: upstream/snapshot3+hdmi~31719
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af9473118979f3b09ee5d92fdbd8014cf085f7c5;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  modules: better error messages when modules fail to load due to a sysfs problem.
  kobject: update documentation
  kset: kernel-doc cleanups
  driver core: revert "device" link creation check
  stable_api_nonsense.txt: Disambiguate the use of "this" by using "that" to refer to the syscall interface
  Fix Doc/sysfs-rules typos
  kernel-doc fixes for PCI and drivers/base/
  kobject: put kobject_actions in kobject.h
  kobject: fix link error when CONFIG_HOTPLUG is disabled
  HOWTO: sync Japanese HOWTO
  HOWTO: adjust translation header of Japanese stable_api_nonsense.txt
---

af9473118979f3b09ee5d92fdbd8014cf085f7c5