From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Jul 2009 17:24:08 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
X-Git-Tag: upstream/snapshot3+hdmi~18097
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4dc32374ed6dd56e09039ea8b7151c3a3e2307d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge git://git./linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  wm97xx_batery: replace driver_data with dev_get_drvdata()
  omap: video: remove direct access of driver_data
  Sound: remove direct access of driver_data
  driver model: fix show/store prototypes in doc.
  Firmware: firmware_class, fix lock imbalance
  Driver Core: remove BUS_ID_SIZE
  sparc: remove driver-core BUS_ID_SIZE
  partitions: fix broken uevent_suppress conversion
  devres: WARN() and return, don't crash on device_del() of uninitialized device
---

a4dc32374ed6dd56e09039ea8b7151c3a3e2307d