From: Arnd Bergmann Date: Mon, 30 Apr 2012 21:57:55 +0000 (+0200) Subject: Merge branch 'keyboard' of git://github.com/hzhuang1/linux into next/drivers X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f7269a825cde879355bd15778012d2c3fb2ff778;p=linux-beck.git Merge branch 'keyboard' of git://github.com/hzhuang1/linux into next/drivers From Haojian Zhuang * '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 --- f7269a825cde879355bd15778012d2c3fb2ff778