Merge 3.13-rc4 into staging-next.

We want the fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc include/linux/hid-sensor-ids.h
index 4cc165887b091685d5ada87624156c2dc0b98626,8323775ac21d0a86d2bda5a9ee93d2cfad181f78..0bf2eb3748dc4f4a62fbe57d4a39aafbdc30417b
--- 1/include/linux/hid-sensor-ids.h
--- 2/include/linux/hid-sensor-ids.h
+++ b/include/linux/hid-sensor-ids.h
@@@ -121,8 -117,16 +121,20 @@@
  #define HID_USAGE_SENSOR_PROP_REPORT_STATE                    0x200316
  #define HID_USAGE_SENSOR_PROY_POWER_STATE                     0x200319
  
 +/* Per data field properties */
 +#define HID_USAGE_SENSOR_DATA_MOD_NONE                                        0x00
 +#define HID_USAGE_SENSOR_DATA_MOD_CHANGE_SENSITIVITY_ABS              0x1000
 +
+ /* Power state enumerations */
+ #define HID_USAGE_SENSOR_PROP_POWER_STATE_UNDEFINED_ENUM              0x00
+ #define HID_USAGE_SENSOR_PROP_POWER_STATE_D0_FULL_POWER_ENUM          0x01
+ #define HID_USAGE_SENSOR_PROP_POWER_STATE_D1_LOW_POWER_ENUM           0x02
+ #define HID_USAGE_SENSOR_PROP_POWER_STATE_D2_STANDBY_WITH_WAKE_ENUM   0x03
+ #define HID_USAGE_SENSOR_PROP_POWER_STATE_D3_SLEEP_WITH_WAKE_ENUM     0x04
+ #define HID_USAGE_SENSOR_PROP_POWER_STATE_D4_POWER_OFF_ENUM           0x05
+ 
+ /* Report State enumerations */
+ #define HID_USAGE_SENSOR_PROP_REPORTING_STATE_NO_EVENTS_ENUM          0x00
+ #define HID_USAGE_SENSOR_PROP_REPORTING_STATE_ALL_EVENTS_ENUM         0x01
+ 
  #endif