aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/include/mach/pm.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-02-04 10:57:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-02-04 10:57:42 -0800
commit31c150a11c867da233a7b5e13b45bcbd3a796bde (patch)
tree58202fc8e93833f3ea3e52f9cb0093e61265d73d /arch/arm/mach-davinci/include/mach/pm.h
parent4554c135a0a017f4cd96f7c0612cb7ca78c68d08 (diff)
parent82b982c9a697e7be0745523a53334fe38a4582c8 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: i8042 - add Lenovo Ideapad U455 to 'reset' blacklist Input: serio_raw - return proper result when serio_raw_read fails Input: document device properties Input: twl4030_keypad - fix comment (trivial) Input: gpio_keys - fix struct device declared inside parameter list Input: evdev - fix variable initialisation
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/pm.h')
0 files changed, 0 insertions, 0 deletions