Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers

Browse source

...

This commit is contained in:

Jens Axboe 2012-07-30 09:03:10 +02:00

parent b1af9be5ef a73ff3231d

commit 72ea1f74fc

1401 changed files with 16420 additions and 8277 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

.mailmap

View file

31

Documentation/ABI/testing/sysfs-bus-iio

View file

17

Documentation/ABI/testing/sysfs-class-mtd

View file

2

Documentation/DocBook/media/v4l/controls.xml

View file

4

Documentation/DocBook/media/v4l/pixfmt.xml

View file

2

Documentation/DocBook/media/v4l/v4l2.xml

View file

5

Documentation/DocBook/media/v4l/vidioc-create-bufs.xml

View file

2

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

View file

7

Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml

View file

2

Documentation/arm/SPEAr/overview.txt

View file

129

Documentation/device-mapper/verity.txt

View file

93

Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.txt

View file

1

Documentation/devicetree/bindings/input/fsl-mma8450.txt

View file

4

Documentation/devicetree/bindings/mfd/mc13xxx.txt

View file

4

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt

View file

2

Documentation/devicetree/bindings/net/fsl-fec.txt

View file

2

Documentation/devicetree/bindings/pinctrl/fsl,imx6q-pinctrl.txt

View file

4

Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt

View file

1

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

22

Documentation/hwmon/coretemp

View file

2

Documentation/kdump/kdump.txt

View file

9

Documentation/kernel-parameters.txt

View file

44

Documentation/networking/stmmac.txt

View file

57

Documentation/prctl/no_new_privs.txt

View file

6

Documentation/stable_kernel_rules.txt

View file

17

Documentation/virtual/kvm/api.txt

View file

278

Documentation/vm/frontswap.txt

View file

99

MAINTAINERS

View file

6

Makefile

View file

3

arch/arm/Kconfig

View file

4

arch/arm/boot/dts/mmp2-brownstone.dts

View file

2

arch/arm/boot/dts/omap2.dtsi

View file

2

arch/arm/boot/dts/spear1310-evb.dts

View file

2

arch/arm/boot/dts/spear1310.dtsi

View file

2

arch/arm/boot/dts/spear1340-evb.dts

View file

2

arch/arm/boot/dts/spear1340.dtsi

View file

13

arch/arm/boot/dts/spear13xx.dtsi

View file

2

arch/arm/boot/dts/spear300-evb.dts

View file

2

arch/arm/boot/dts/spear300.dtsi

View file

2

arch/arm/boot/dts/spear310-evb.dts

View file

2

arch/arm/boot/dts/spear310.dtsi

View file

8

arch/arm/boot/dts/spear320-evb.dts

View file

2

arch/arm/boot/dts/spear320.dtsi

View file

2

arch/arm/boot/dts/spear3xx.dtsi

View file

1

arch/arm/boot/dts/spear600.dtsi

View file

16

arch/arm/common/dmabounce.c

View file

1

arch/arm/configs/omap2plus_defconfig

View file

2

arch/arm/include/asm/atomic.h

View file

18

arch/arm/include/asm/domain.h

View file

1

arch/arm/include/asm/futex.h

View file

2

arch/arm/include/asm/hardware/sp810.h

View file

5

arch/arm/include/asm/thread_info.h

View file

1

arch/arm/kernel/entry-armv.S

View file

4

arch/arm/kernel/kprobes-test-arm.c

View file

2

arch/arm/kernel/kprobes-thumb.c

View file

2

arch/arm/kernel/perf_event.c

View file

3

arch/arm/kernel/ptrace.c

View file

46

arch/arm/kernel/signal.c

View file

2

arch/arm/kernel/signal.h

View file

2

arch/arm/kernel/traps.c

View file

2

arch/arm/kernel/vmlinux.lds.S

View file

1

arch/arm/mach-dove/include/mach/bridge-regs.h

View file

1

arch/arm/mach-dove/include/mach/dove.h

View file

8

arch/arm/mach-exynos/Kconfig

View file

13

arch/arm/mach-exynos/pm_domains.c

View file

6

arch/arm/mach-highbank/Makefile

View file

1

arch/arm/mach-highbank/core.h

View file

14

arch/arm/mach-highbank/highbank.c

View file

27

arch/arm/mach-highbank/smc.S

View file

1

arch/arm/mach-imx/Kconfig

View file

3

arch/arm/mach-imx/clk-imx1.c

View file

4

arch/arm/mach-imx/clk-imx21.c

View file

2

arch/arm/mach-imx/clk-imx25.c

View file

3

arch/arm/mach-imx/clk-imx27.c

View file

3

arch/arm/mach-imx/clk-imx31.c

View file

15

arch/arm/mach-imx/clk-imx35.c

View file

12

arch/arm/mach-imx/clk-imx51-imx53.c

View file

26

arch/arm/mach-imx/clk-imx6q.c

View file

95

arch/arm/mach-imx/clk-pllv2.c

View file

2

arch/arm/mach-imx/crm-regs-imx5.h

View file

42

arch/arm/mach-imx/hotplug.c

View file

1

arch/arm/mach-imx/mach-cpuimx35.c

View file

1

arch/arm/mach-imx/mach-cpuimx51sd.c

View file

38

arch/arm/mach-imx/mach-imx27_visstrim_m10.c

View file

2

arch/arm/mach-imx/mach-mx21ads.c

View file

4

arch/arm/mach-imx/mm-imx3.c

View file

2

arch/arm/mach-imx/mm-imx5.c

View file

3

arch/arm/mach-kirkwood/board-iconnect.c

View file

9

arch/arm/mach-kirkwood/common.c

View file

1

arch/arm/mach-kirkwood/include/mach/bridge-regs.h

View file

1

arch/arm/mach-kirkwood/include/mach/kirkwood.h

View file

29

arch/arm/mach-mmp/include/mach/gpio-pxa.h

View file

7

arch/arm/mach-mmp/irq.c

View file

1

arch/arm/mach-mv78xx0/include/mach/bridge-regs.h

View file

2

arch/arm/mach-mv78xx0/include/mach/mv78xx0.h

View file

11

arch/arm/mach-mxs/mach-apx4devkit.c

View file

5

arch/arm/mach-omap2/board-flash.c

View file

6

arch/arm/mach-omap2/board-n8x0.c

View file

28

arch/arm/mach-omap2/board-omap3beagle.c

View file

2

arch/arm/mach-omap2/board-overo.c

View file

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