summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-21 10:54:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-21 10:54:53 -0700
commit7e08117de6ee17ae6c8f2983999a98cb95eb9bc2 (patch)
tree077d02824bdb535ab63197bd78cf724b16bf434b /drivers/media
parentdc9c12f46fcf01d42756a73c681f18a99e7223b6 (diff)
parent1ae5ddb6f8837558928a1a694c7b8af7f09fdd21 (diff)
downloadlinux-7e08117de6ee17ae6c8f2983999a98cb95eb9bc2.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input layer fix from Dmitry Torokhov: "A small fixup to gpio_keys_polled driver" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: gpio_keys_polled - request GPIO pin as input.
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions