Merge branch 'pxa-keypad'