| commit | 2d12a18b89f5e3c0cce1981cc257228bfbf9039f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 05 20:57:08 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 05 20:57:08 2011 -0700 |
| tree | 18aa9b66f6cc981196e911105676aad0bc25ad26 | |
| parent | 121782a248f11c63c7c0fc78d4a68a54e99ee37d [diff] | |
| parent | 8509e142567d69e170a184ecf27d7a6a3239fd72 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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()