Merge branch 'next' into for-linus

diff --cc drivers/input/input.c
Simple merge

diff --cc drivers/input/touchscreen/usbtouchscreen.c
Simple merge

diff --cc include/linux/input.h
index 663208a,b1a74fb..889a480
--- 1/include/linux/input.h
--- 2/include/linux/input.h
+++ b/include/linux/input.h
@@@ -376,9 -376,8 +376,9 @@@ struct input_absinfo 
  #define KEY_DISPLAY_OFF               245     /* display device to off state */
  
  #define KEY_WIMAX             246
 +#define KEY_RFKILL            247     /* Key that controls all radios */
  
- /* Range 248 - 255 is reserved for special needs of AT keyboard driver */
+ /* Code 255 is reserved for special needs of AT keyboard driver */
  
  #define BTN_MISC              0x100
  #define BTN_0                 0x100