summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/perf_event_xscale.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-07 08:31:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-07 08:31:31 -0800
commitd09b3c9618f72ca018836998b13045edec3c8301 (patch)
tree4bdd35249faad438fee4b3cdf6fb9c78fc635823 /arch/arm/kernel/perf_event_xscale.c
parent4293f20c19f44ca66e5ac836b411d25e14b9f185 (diff)
parent19d57d3a145e94349abf805eed2316ef720d86c2 (diff)
downloadtalos-op-linux-d09b3c9618f72ca018836998b13045edec3c8301.tar.gz
talos-op-linux-d09b3c9618f72ca018836998b13045edec3c8301.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: "Just a few driver fixups, nothing exciting." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wacom - fix 3rd-gen Bamboo MT when 4+ fingers are in use Input: twl4030-vibra - use proper guard for PM methods Input: evdev - fix variable initialisation Input: wacom - add missing LEDS_CLASS to Kconfig Input: ALPS - fix touchpad detection when buttons are pressed
Diffstat (limited to 'arch/arm/kernel/perf_event_xscale.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud