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 a321e91b 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>
Showing
- CREDITS 7 additions, 7 deletionsCREDITS
- Documentation/00-INDEX 141 additions, 10 deletionsDocumentation/00-INDEX
- Documentation/ABI/stable/sysfs-class-tpm 185 additions, 0 deletionsDocumentation/ABI/stable/sysfs-class-tpm
- Documentation/ABI/testing/ima_policy 7 additions, 3 deletionsDocumentation/ABI/testing/ima_policy
- Documentation/ABI/testing/pstore 5 additions, 5 deletionsDocumentation/ABI/testing/pstore
- Documentation/ABI/testing/sysfs-bus-event_source-devices-events 62 additions, 0 deletions...ntation/ABI/testing/sysfs-bus-event_source-devices-events
- Documentation/ABI/testing/sysfs-bus-fcoe 42 additions, 3 deletionsDocumentation/ABI/testing/sysfs-bus-fcoe
- Documentation/ABI/testing/sysfs-bus-iio-mpu6050 13 additions, 0 deletionsDocumentation/ABI/testing/sysfs-bus-iio-mpu6050
- Documentation/ABI/testing/sysfs-bus-usb 9 additions, 0 deletionsDocumentation/ABI/testing/sysfs-bus-usb
- Documentation/ABI/testing/sysfs-class-bdi 5 additions, 0 deletionsDocumentation/ABI/testing/sysfs-class-bdi
- Documentation/ABI/testing/sysfs-devices-power_resources_D0 13 additions, 0 deletionsDocumentation/ABI/testing/sysfs-devices-power_resources_D0
- Documentation/ABI/testing/sysfs-devices-power_resources_D1 14 additions, 0 deletionsDocumentation/ABI/testing/sysfs-devices-power_resources_D1
- Documentation/ABI/testing/sysfs-devices-power_resources_D2 14 additions, 0 deletionsDocumentation/ABI/testing/sysfs-devices-power_resources_D2
- Documentation/ABI/testing/sysfs-devices-power_resources_D3hot 14 additions, 0 deletions...mentation/ABI/testing/sysfs-devices-power_resources_D3hot
- Documentation/ABI/testing/sysfs-devices-power_state 20 additions, 0 deletionsDocumentation/ABI/testing/sysfs-devices-power_state
- Documentation/ABI/testing/sysfs-devices-real_power_state 23 additions, 0 deletionsDocumentation/ABI/testing/sysfs-devices-real_power_state
- Documentation/ABI/testing/sysfs-devices-resource_in_use 12 additions, 0 deletionsDocumentation/ABI/testing/sysfs-devices-resource_in_use
- Documentation/ABI/testing/sysfs-devices-system-cpu 0 additions, 14 deletionsDocumentation/ABI/testing/sysfs-devices-system-cpu
- Documentation/ABI/testing/sysfs-driver-hid-srws1 21 additions, 0 deletionsDocumentation/ABI/testing/sysfs-driver-hid-srws1
- Documentation/ABI/testing/sysfs-driver-hid-thingm 23 additions, 0 deletionsDocumentation/ABI/testing/sysfs-driver-hid-thingm
Loading
Please register or sign in to comment