Merge commit 'v2.6.38-rc6' into for-2.6.39/core
Conflicts:
block/cfq-iosched.c
Signed-off-by:
Jens Axboe <jaxboe@fusionio.com>
Showing
- .mailmap 2 additions, 0 deletions.mailmap
- CREDITS 2 additions, 4 deletionsCREDITS
- Documentation/ABI/stable/thermal-notification 4 additions, 0 deletionsDocumentation/ABI/stable/thermal-notification
- Documentation/ABI/testing/sysfs-class-led 9 additions, 0 deletionsDocumentation/ABI/testing/sysfs-class-led
- Documentation/ABI/testing/sysfs-class-net-batman-adv 0 additions, 0 deletionsDocumentation/ABI/testing/sysfs-class-net-batman-adv
- Documentation/ABI/testing/sysfs-class-net-mesh 28 additions, 0 deletionsDocumentation/ABI/testing/sysfs-class-net-mesh
- Documentation/ABI/testing/sysfs-driver-hid-roccat-kone 8 additions, 8 deletionsDocumentation/ABI/testing/sysfs-driver-hid-roccat-kone
- Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus 108 additions, 0 deletionsDocumentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
- Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra 9 additions, 9 deletionsDocumentation/ABI/testing/sysfs-driver-hid-roccat-pyra
- Documentation/ABI/testing/sysfs-platform-at91 25 additions, 0 deletionsDocumentation/ABI/testing/sysfs-platform-at91
- Documentation/ABI/testing/sysfs-platform-ideapad-laptop 6 additions, 0 deletionsDocumentation/ABI/testing/sysfs-platform-ideapad-laptop
- Documentation/ABI/testing/sysfs-tty 19 additions, 0 deletionsDocumentation/ABI/testing/sysfs-tty
- Documentation/DocBook/80211.tmpl 85 additions, 6 deletionsDocumentation/DocBook/80211.tmpl
- Documentation/DocBook/device-drivers.tmpl 6 additions, 2 deletionsDocumentation/DocBook/device-drivers.tmpl
- Documentation/DocBook/drm.tmpl 3 additions, 3 deletionsDocumentation/DocBook/drm.tmpl
- Documentation/DocBook/dvb/dvbapi.xml 1 addition, 1 deletionDocumentation/DocBook/dvb/dvbapi.xml
- Documentation/DocBook/filesystems.tmpl 5 additions, 0 deletionsDocumentation/DocBook/filesystems.tmpl
- Documentation/DocBook/media.tmpl 2 additions, 2 deletionsDocumentation/DocBook/media.tmpl
- Documentation/DocBook/mtdnand.tmpl 1 addition, 1 deletionDocumentation/DocBook/mtdnand.tmpl
- Documentation/DocBook/v4l/dev-rds.xml 4 additions, 2 deletionsDocumentation/DocBook/v4l/dev-rds.xml
Loading
Please register or sign in to comment