Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Aug 2015 17:54:53 +0000 (10:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Aug 2015 17:54:53 +0000 (10:54 -0700)
commit7e08117de6ee17ae6c8f2983999a98cb95eb9bc2
tree077d02824bdb535ab63197bd78cf724b16bf434b
parentdc9c12f46fcf01d42756a73c681f18a99e7223b6
parent1ae5ddb6f8837558928a1a694c7b8af7f09fdd21
Merge branch 'for-linus' of git://git./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.
drivers/input/keyboard/gpio_keys_polled.c