Merge branch 'next' into for-linus

This commit is contained in:
Dmitry Torokhov 2011-01-11 22:01:45 -08:00
commit 01c728a246
18 changed files with 624 additions and 265 deletions

View file

@ -800,6 +800,7 @@ struct input_keymap_entry {
#define SW_CAMERA_LENS_COVER 0x09 /* set = lens covered */
#define SW_KEYPAD_SLIDE 0x0a /* set = keypad slide out */
#define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */
#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */
#define SW_MAX 0x0f
#define SW_CNT (SW_MAX+1)