Merge branch 'keyboard' of git://github.com/hzhuang1/linux into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Mon, 30 Apr 2012 21:57:55 +0000 (23:57 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 30 Apr 2012 21:57:55 +0000 (23:57 +0200)
commitf7269a825cde879355bd15778012d2c3fb2ff778
treed36d61e3953e096efa1094442aee5ef1d2fab1d3
parent66f75a5d028beaf67c931435fdc3e7823125730c
parentfb054bf26914ee4c55cf149bc5b2a8e2c89fb81f
Merge branch 'keyboard' of git://github.com/hzhuang1/linux into next/drivers

From Haojian Zhuang <haojian.zhuang@gmail.com>

* 'keyboard' of git://github.com/hzhuang1/linux:
  Input: pxa27x_keypad add choice to set direct_key_mask
  Input: pxa27x_keypad direct key may be low active
  Input: pxa27x_keypad bug fix for direct_key_mask
  Input: pxa27x_keypad keep clock on as wakeup source

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This page took 0.041392 seconds and 5 git commands to generate.