Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus

Browse source

Conflicts:
	drivers/hid/hid-core.c

...

This commit is contained in:

Jiri Kosina 2012-12-12 21:41:55 +01:00

parent f9af7b9edc b5531318f1 7a7d6d9c5f 1b42fc4a28 955dca354c 68fd32b822 4529eefad0

commit 818b930bc1

14441 changed files with 1447842 additions and 1194752 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

Documentation/00-INDEX

View file

22

Documentation/ABI/obsolete/proc-pid-oom_adj

View file

38

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus

View file

66

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-kovaplus

View file

73

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra

View file

25

Documentation/ABI/testing/ima_policy

View file

14

Documentation/ABI/testing/sysfs-block

View file

12

Documentation/ABI/testing/sysfs-bus-fcoe

View file

18

Documentation/ABI/testing/sysfs-bus-rbd

View file

7

Documentation/ABI/testing/sysfs-bus-usb

View file

17

Documentation/ABI/testing/sysfs-devices-firmware_node

View file

11

Documentation/ABI/testing/sysfs-devices-system-cpu

View file

8

Documentation/ABI/testing/sysfs-driver-hid-roccat-isku

View file

48

Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus

View file

69

Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus

View file

7

Documentation/ABI/testing/sysfs-driver-hid-roccat-lua

View file

76

Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra

View file

3

Documentation/ABI/testing/sysfs-driver-hid-roccat-savu

View file

70

Documentation/ABI/testing/sysfs-driver-ppi

View file

13

Documentation/ABI/testing/sysfs-fs-ext4

View file

6

Documentation/ABI/testing/sysfs-ptp

View file

9

Documentation/ABI/testing/sysfs-tty

View file

10

Documentation/CodingStyle

View file

2881

Documentation/DocBook/drm.tmpl

View file

78

Documentation/DocBook/media/Makefile

View file

113

Documentation/DocBook/media/dvb/audio.xml

View file

353

Documentation/DocBook/media/dvb/ca.xml

View file

230

Documentation/DocBook/media/dvb/demux.xml

View file

4

Documentation/DocBook/media/dvb/dvbapi.xml

View file

113

Documentation/DocBook/media/dvb/dvbproperty.xml

View file

69

Documentation/DocBook/media/dvb/frontend.xml

View file

2

Documentation/DocBook/media/dvb/intro.xml

View file

2

Documentation/DocBook/media/dvb/kdapi.xml

View file

127

Documentation/DocBook/media/dvb/net.xml

View file

333

Documentation/DocBook/media/dvb/video.xml

View file

52

Documentation/DocBook/media/v4l/biblio.xml

View file

30

Documentation/DocBook/media/v4l/common.xml

View file

43

Documentation/DocBook/media/v4l/compat.xml

View file

892

Documentation/DocBook/media/v4l/controls.xml

View file

7

Documentation/DocBook/media/v4l/dev-osd.xml

View file

2

Documentation/DocBook/media/v4l/dev-rds.xml

View file

20

Documentation/DocBook/media/v4l/dev-subdev.xml

View file

19

Documentation/DocBook/media/v4l/gen-errors.xml

View file

27

Documentation/DocBook/media/v4l/io.xml

View file

17

Documentation/DocBook/media/v4l/pixfmt-nv12m.xml

View file

3

Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml

View file

154

Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml

View file

39

Documentation/DocBook/media/v4l/pixfmt.xml

View file

22

Documentation/DocBook/media/v4l/selection-api.xml

View file

44

Documentation/DocBook/media/v4l/subdev-formats.xml

View file

15

Documentation/DocBook/media/v4l/v4l2.xml

View file

12

Documentation/DocBook/media/v4l/vidioc-cropcap.xml

View file

7

Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml

View file

7

Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml

View file

6

Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml

View file

6

Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml

View file

9

Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml

View file

7

Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml

View file

2

Documentation/DocBook/media/v4l/vidioc-enuminput.xml

View file

2

Documentation/DocBook/media/v4l/vidioc-enumoutput.xml

View file

6

Documentation/DocBook/media/v4l/vidioc-enumstd.xml

View file

6

Documentation/DocBook/media/v4l/vidioc-g-crop.xml

View file

9

Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml

View file

13

Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml

View file

7

Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml

View file

13

Documentation/DocBook/media/v4l/vidioc-g-fmt.xml

View file

4

Documentation/DocBook/media/v4l/vidioc-g-parm.xml

View file

9

Documentation/DocBook/media/v4l/vidioc-g-selection.xml

View file

10

Documentation/DocBook/media/v4l/vidioc-g-std.xml

View file

6

Documentation/DocBook/media/v4l/vidioc-g-tuner.xml

View file

5

Documentation/DocBook/media/v4l/vidioc-qbuf.xml

View file

9

Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml

View file

6

Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml

View file

11

Documentation/DocBook/media/v4l/vidioc-querybuf.xml

View file

10

Documentation/DocBook/media/v4l/vidioc-querycap.xml

View file

8

Documentation/DocBook/media/v4l/vidioc-querystd.xml

View file

5

Documentation/DocBook/media/v4l/vidioc-reqbufs.xml

View file

10

Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml

View file

7

Documentation/DocBook/media/v4l/vidioc-streamon.xml

View file

152

Documentation/DocBook/media/v4l/vidioc-subdev-g-edid.xml

View file

8

Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml

View file

9

Documentation/DocBook/media_api.tmpl

View file

2

Documentation/DocBook/mtdnand.tmpl

View file

4

Documentation/DocBook/networking.tmpl

View file

65

Documentation/IPMI.txt

View file

58

Documentation/aoe/aoe.txt

View file

41

Documentation/aoe/mkdevs.sh

View file

28

Documentation/aoe/mkshelf.sh

View file

3

Documentation/aoe/status.sh

View file

22

Documentation/arm/Booting

View file

232

Documentation/arm/Marvell/README

View file

82

Documentation/arm/Samsung-S3C24XX/GPIO.txt

View file

8

Documentation/arm/Samsung/GPIO.txt

View file

3

Documentation/arm/memory.txt

View file

14

Documentation/arm64/memory.txt

View file

5

Documentation/block/biodoc.txt

View file

92

Documentation/cgroups/cgroups.txt

View file

90

Documentation/cgroups/memory.txt

View file

93

Documentation/cpu-freq/boost.txt

View file

10

Documentation/cpuidle/sysfs.txt

View file

Some files were not shown because too many files have changed in this diff Show more