Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: i8042 - print debug data when testing AUX IRQ delivery
  Input: libps2 - fix dependancy on i8042
  Input: fix rx51 board keymap
  Input: ad7879 - pass up error codes from probe functions
  Input: xpad - add BigBen Interactive XBOX 360 Controller
  Input: rotary_encoder - fix relative axis support
  Input: sparkspkr - move remove() functions to .devexit.text
  Input: wistron_btns - add DMI entry for Medion WIM2030 laptop

1 files changed, 39 insertions, 39 deletions

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index b45ad312c587..c1af5326e92f 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -38,49 +38,49 @@
 
 static int board_keymap[] = {
         KEY(0, 0, KEY_Q),
-        KEY(0, 1, KEY_W),
-        KEY(0, 2, KEY_E),
-        KEY(0, 3, KEY_R),
-        KEY(0, 4, KEY_T),
-        KEY(0, 5, KEY_Y),
-        KEY(0, 6, KEY_U),
-        KEY(0, 7, KEY_I),
-        KEY(1, 0, KEY_O),
+        KEY(0, 1, KEY_O),
+        KEY(0, 2, KEY_P),
+        KEY(0, 3, KEY_COMMA),
+        KEY(0, 4, KEY_BACKSPACE),
+        KEY(0, 6, KEY_A),
+        KEY(0, 7, KEY_S),
+        KEY(1, 0, KEY_W),
         KEY(1, 1, KEY_D),
-        KEY(1, 2, KEY_DOT),
-        KEY(1, 3, KEY_V),
-        KEY(1, 4, KEY_DOWN),
-        KEY(2, 0, KEY_P),
-        KEY(2, 1, KEY_F),
+        KEY(1, 2, KEY_F),
+        KEY(1, 3, KEY_G),
+        KEY(1, 4, KEY_H),
+        KEY(1, 5, KEY_J),
+        KEY(1, 6, KEY_K),
+        KEY(1, 7, KEY_L),
+        KEY(2, 0, KEY_E),
+        KEY(2, 1, KEY_DOT),
         KEY(2, 2, KEY_UP),
-        KEY(2, 3, KEY_B),
-        KEY(2, 4, KEY_RIGHT),
-        KEY(3, 0, KEY_COMMA),
-        KEY(3, 1, KEY_G),
-        KEY(3, 2, KEY_ENTER),
+        KEY(2, 3, KEY_ENTER),
+        KEY(2, 5, KEY_Z),
+        KEY(2, 6, KEY_X),
+        KEY(2, 7, KEY_C),
+        KEY(3, 0, KEY_R),
+        KEY(3, 1, KEY_V),
+        KEY(3, 2, KEY_B),
         KEY(3, 3, KEY_N),
-        KEY(4, 0, KEY_BACKSPACE),
-        KEY(4, 1, KEY_H),
-        KEY(4, 3, KEY_M),
+        KEY(3, 4, KEY_M),
+        KEY(3, 5, KEY_SPACE),
+        KEY(3, 6, KEY_SPACE),
+        KEY(3, 7, KEY_LEFT),
+        KEY(4, 0, KEY_T),
+        KEY(4, 1, KEY_DOWN),
+        KEY(4, 2, KEY_RIGHT),
         KEY(4, 4, KEY_LEFTCTRL),
-        KEY(5, 1, KEY_J),
-        KEY(5, 2, KEY_Z),
-        KEY(5, 3, KEY_SPACE),
-        KEY(5, 4, KEY_LEFTSHIFT),
-        KEY(6, 0, KEY_A),
-        KEY(6, 1, KEY_K),
-        KEY(6, 2, KEY_X),
-        KEY(6, 3, KEY_SPACE),
-        KEY(6, 4, KEY_FN),
-        KEY(7, 0, KEY_S),
-        KEY(7, 1, KEY_L),
-        KEY(7, 2, KEY_C),
-        KEY(7, 3, KEY_LEFT),
-        KEY(0xff, 0, KEY_F6),
-        KEY(0xff, 1, KEY_F7),
-        KEY(0xff, 2, KEY_F8),
-        KEY(0xff, 4, KEY_F9),
-        KEY(0xff, 5, KEY_F10),
+        KEY(4, 5, KEY_RIGHTALT),
+        KEY(4, 6, KEY_LEFTSHIFT),
+        KEY(5, 0, KEY_Y),
+        KEY(6, 0, KEY_U),
+        KEY(7, 0, KEY_I),
+        KEY(7, 1, KEY_F7),
+        KEY(7, 2, KEY_F8),
+        KEY(0xff, 2, KEY_F9),
+        KEY(0xff, 4, KEY_F10),
+        KEY(0xff, 5, KEY_F11),
 };
 
 static struct matrix_keymap_data board_map_data = {