summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-06 05:57:08 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-06 05:57:08 +0200
commit2d12a18b89f5e3c0cce1981cc257228bfbf9039f (patch)
tree18aa9b66f6cc981196e911105676aad0bc25ad26 /drivers/pci/pci.h
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff)
parentmfd: Add Makefile and Kconfig Entries for tps65911 comparator (diff)
downloadlinux-2d12a18b89f5e3c0cce1981cc257228bfbf9039f.tar.xz
linux-2d12a18b89f5e3c0cce1981cc257228bfbf9039f.zip
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()
Diffstat (limited to 'drivers/pci/pci.h')
0 files changed, 0 insertions, 0 deletions