Merge branch 'linus' into perf/urgent

Browse source

Merge reason: Linus applied an overlapping commit:

  5f2e8e2b0b: kernel/watchdog.c: Use proper ANSI C prototypes

So merge it in to make sure we can iterate the file without conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2011-05-26 13:48:30 +02:00

parent 6e9101aeec 4db70f73e5

commit 1102c660dd

5434 changed files with 395102 additions and 355121 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

1

.gitignore vendored

View file

1

.mailmap

View file

10

CREDITS

View file

10

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

View file

64

Documentation/ABI/testing/sysfs-block

View file

31

Documentation/ABI/testing/sysfs-bus-bcma

View file

9

Documentation/ABI/testing/sysfs-bus-pci

View file

19

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

View file

98

Documentation/ABI/testing/sysfs-ptp

View file

1

Documentation/DocBook/.gitignore vendored

View file

2

Documentation/DocBook/Makefile

View file

8

Documentation/DocBook/dvb/dvbapi.xml

View file

405

Documentation/DocBook/dvb/dvbproperty.xml

View file

20

Documentation/DocBook/dvb/frontend.h.xml

View file

2

Documentation/DocBook/media-entities.tmpl

View file

147

Documentation/DocBook/v4l/pixfmt-m420.xml

View file

43

Documentation/DocBook/v4l/pixfmt-y10b.xml

View file

2

Documentation/DocBook/v4l/pixfmt.xml

View file

46

Documentation/DocBook/v4l/subdev-formats.xml

View file

4

Documentation/DocBook/v4l/videodev2.h.xml

View file

2

Documentation/HOWTO

View file

17

Documentation/IRQ-affinity.txt

View file

9

Documentation/SubmittingPatches

View file

15

Documentation/blockdev/cciss.txt

View file

2

Documentation/cachetlb.txt

View file

397

Documentation/devicetree/bindings/crypto/fsl-sec4.txt

View file

61

Documentation/devicetree/bindings/net/can/fsl-flexcan.txt Executable file

View file

54

Documentation/devicetree/bindings/net/fsl-tsec-phy.txt

View file

76

Documentation/devicetree/bindings/powerpc/fsl/ifc.txt

View file

38

Documentation/devicetree/bindings/powerpc/fsl/mpic-timer.txt

View file

2

Documentation/devicetree/bindings/powerpc/fsl/mpic.txt

View file

2

Documentation/devicetree/bindings/powerpc/nintendo/wii.txt

View file

58

Documentation/dontdiff

View file

46

Documentation/feature-removal-schedule.txt

View file

29

Documentation/filesystems/9p.txt

View file

11

Documentation/filesystems/proc.txt

View file

26

Documentation/filesystems/ubifs.txt

View file

0

Documentation/usb/hiddev.txt → Documentation/hid/hiddev.txt

View file

119

Documentation/hid/hidraw.txt

View file

60

Documentation/hwmon/adm1275

View file

21

Documentation/hwmon/coretemp

View file

42

Documentation/hwmon/emc6w201

View file

4

Documentation/hwmon/f71882fg

View file

37

Documentation/hwmon/fam15h_power

View file

3

Documentation/hwmon/k10temp

View file

98

Documentation/hwmon/max16065

View file

21

Documentation/hwmon/max6642

View file

21

Documentation/hwmon/max6650

View file

36

Documentation/hwmon/pkgtemp

View file

74

Documentation/hwmon/sht15

View file

110

Documentation/hwmon/ucd9000

View file

112

Documentation/hwmon/ucd9200

View file

1

Documentation/i2c/busses/i2c-i801

View file

2

Documentation/i2c/writing-clients

View file

121

Documentation/input/elantech.txt

View file

13

Documentation/input/rotary-encoder.txt

View file

3

Documentation/ioctl/ioctl-number.txt

View file

13

Documentation/kbuild/kbuild.txt

View file

32

Documentation/kbuild/kconfig-language.txt

View file

5

Documentation/kbuild/kconfig.txt

View file

53

Documentation/kbuild/makefiles.txt

View file

7

Documentation/kernel-parameters.txt

View file

2

Documentation/lockstat.txt

View file

2

Documentation/mmc/00-INDEX

View file

10

Documentation/mmc/mmc-dev-attrs.txt

View file

27

Documentation/mmc/mmc-dev-parts.txt

View file

11

Documentation/networking/batman-adv.txt

View file

45

Documentation/networking/bonding.txt

View file

13

Documentation/networking/igb.txt

View file

99

Documentation/pti/pti_intel_mid.txt

View file

89

Documentation/ptp/ptp.txt

View file

381

Documentation/ptp/testptp.c

View file

33

Documentation/ptp/testptp.mk

View file

292

Documentation/scsi/LICENSE.qla2xxx

View file

7

Documentation/sound/alsa/ALSA-Configuration.txt

View file

2

Documentation/sound/alsa/HD-Audio-Models.txt

View file

2

Documentation/stable_api_nonsense.txt

View file

7

Documentation/sysctl/fs.txt

View file

11

Documentation/sysctl/net.txt

View file

4

Documentation/sysctl/vm.txt

View file

2

Documentation/timers/timers-howto.txt

View file

8

Documentation/usb/callbacks.txt

View file

4

Documentation/usb/linux-cdc-acm.inf

View file

6

Documentation/usb/linux.inf

View file

20

Documentation/vgaarbiter.txt

View file

2

Documentation/video4linux/CARDLIST.em28xx

View file

1

Documentation/video4linux/Zoran

View file

1

Documentation/video4linux/gspca.txt

View file

239

Documentation/video4linux/uvcvideo.txt

View file

34

Documentation/virtual/kvm/api.txt

View file

10

Documentation/virtual/uml/UserModeLinux-HOWTO.txt

View file

2

Documentation/vm/locking

View file

100

MAINTAINERS

View file

67

Makefile

View file

6

arch/Kconfig

View file

4

arch/alpha/Kconfig

View file

55

arch/alpha/include/asm/gpio.h

View file

2

arch/alpha/include/asm/smp.h

View file

2

arch/alpha/kernel/process.c

View file

2

arch/alpha/kernel/setup.c

View file

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