Merge branch 'pxa-keypad'
Dmitry Torokhov [Wed, 6 Feb 2008 05:54:05 +0000 (00:54 -0500)]

Trivial merge