From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Jul 2011 03:57:08 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
X-Git-Tag: upstream/snapshot3+hdmi~9733
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d12a18b89f5e3c0cce1981cc257228bfbf9039f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-linus' of git://git./linux/kernel/git/sameo/mfd-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Add Makefile and Kconfig Entries for tps65911 comparator
  mfd: Fix build error for tps65911-comparator.c
  Revert "mfd: Add omap-usbhs runtime PM support"
  input: pmic8xxx-pwrkey: Do not use mfd_get_data()
  input: pmic8xxx-keypad: Do not use mfd_get_data()
---

2d12a18b89f5e3c0cce1981cc257228bfbf9039f