aboutsummaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-07-17 21:48:22 +0200
committerArnd Bergmann <arnd@arndb.de>2011-07-17 21:48:22 +0200
commitbc574e190d3fbed37d724e33a16aee326d6f2ac4 (patch)
treeecbd7238f1402783f122d2a1a0310bb2cdb1dd9a /drivers/input
parentb0af8dfdd67699e25083478c63eedef2e72ebd85 (diff)
parentdb47cccebd74e575963bc80cc5ac926399388a21 (diff)
parent345e397d841068c4ba2829a226fbe6613bac1d0d (diff)
Merge branches 'omap/prcm' and 'omap/mfd' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/devel-2