Merge tag 'v3.9-rc3' into drm-intel-next-queued

Backmerge so that I can merge Imre Deak's coalesced sg entries fixes,
which depend upon the new for_each_sg_page introduce in

commit a321e91b6d73ed011ffceed384c40d2785cf723b
Author: Imre Deak <imre.deak@intel.com>
Date:   Wed Feb 27 17:02:56 2013 -0800

    lib/scatterlist: add simple page iterator

The merge itself is just two trivial conflicts:

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 9 insertions, 0 deletions

diff --git a/include/linux/hid-sensor-ids.h b/include/linux/hid-sensor-ids.h
index 55f277372fed..6f24446e7669 100644
--- a/include/linux/hid-sensor-ids.h
+++ b/include/linux/hid-sensor-ids.h
@@ -66,6 +66,15 @@
 #define HID_USAGE_SENSOR_ORIENT_MAGN_FLUX_Y_AXIS                0x200486
 #define HID_USAGE_SENSOR_ORIENT_MAGN_FLUX_Z_AXIS                0x200487
 
+/* Time (2000a0) */
+#define HID_USAGE_SENSOR_TIME                                   0x2000a0
+#define HID_USAGE_SENSOR_TIME_YEAR                              0x200521
+#define HID_USAGE_SENSOR_TIME_MONTH                             0x200522
+#define HID_USAGE_SENSOR_TIME_DAY                               0x200523
+#define HID_USAGE_SENSOR_TIME_HOUR                              0x200525
+#define HID_USAGE_SENSOR_TIME_MINUTE                            0x200526
+#define HID_USAGE_SENSOR_TIME_SECOND                            0x200527
+
 /* Units */
 #define HID_USAGE_SENSOR_UNITS_NOT_SPECIFIED                    0x00
 #define HID_USAGE_SENSOR_UNITS_LUX                              0x01