diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-04-30 23:57:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-04-30 23:57:55 +0200 |
| commit | f7269a825cde879355bd15778012d2c3fb2ff778 (patch) | |
| tree | d36d61e3953e096efa1094442aee5ef1d2fab1d3 /drivers/usb/host | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
| parent | fb054bf26914ee4c55cf149bc5b2a8e2c89fb81f (diff) | |
| download | linux-f7269a825cde879355bd15778012d2c3fb2ff778.tar.bz2 | |
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>
Diffstat (limited to 'drivers/usb/host')
0 files changed, 0 insertions, 0 deletions