From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 1 Mar 2010 07:55:20 +0000 (-0800)
Subject: Merge branch 'next' into for-linus
X-Git-Tag: v2.6.34-rc1~236^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=35858adbfca13678af99fb31618ef4428d6dedb0;p=~shefty%2Frdma-dev.git

Merge branch 'next' into for-linus
---

35858adbfca13678af99fb31618ef4428d6dedb0
diff --cc include/linux/input.h
index 663208afb64,b1a74fb2e43..889a4801f7b
--- a/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