Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel

Browse source

Conflicts (trivial overlapping cleanups):
	drivers/spi/spi-atmel.c

...

This commit is contained in:

Mark Brown 2013-10-16 21:16:41 +01:00

parent 01b9e04186 f6bd03a746

commit 381bd9517a

1056 changed files with 10109 additions and 5810 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

3

CREDITS

View file

14

Documentation/arm64/tagged-pointers.txt

View file

2

Documentation/block/00-INDEX

View file

8

Documentation/block/cmdline-partition.txt

View file

10

Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt

View file

10

Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt

View file

8

Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt → Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt

View file

17

Documentation/devicetree/bindings/mmc/tmio_mmc.txt

View file

18

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

View file

2

Documentation/devicetree/bindings/pci/designware-pcie.txt

View file

0

Documentation/devicetree/bindings/tty/serial/qca,ar9330-uart.txt → Documentation/devicetree/bindings/serial/qca,ar9330-uart.txt

View file

14

Documentation/filesystems/vfs.txt

View file

10

Documentation/kernel-parameters.txt

View file

6

Documentation/networking/bonding.txt

View file

4

Documentation/scheduler/sched-design-CFS.txt

View file

7

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

View file

40

MAINTAINERS

View file

2

Makefile

View file

3

arch/Kconfig

View file

9

arch/arc/include/asm/spinlock.h

View file

4

arch/arc/include/asm/uaccess.h

View file

2

arch/arc/kernel/ptrace.c

View file

25

arch/arc/kernel/signal.c

View file

7

arch/arc/kernel/time.c

View file

6

arch/arc/kernel/unaligned.c

View file

3

arch/arm/Kconfig

View file

9

arch/arm/Makefile

View file

16

arch/arm/boot/Makefile

View file

3

arch/arm/boot/dts/Makefile

View file

262

arch/arm/boot/dts/am335x-bone-common.dtsi

View file

256

arch/arm/boot/dts/am335x-bone.dts

View file

17

arch/arm/boot/dts/am335x-boneblack.dts

View file

49

arch/arm/boot/dts/armada-370-netgear-rn102.dts

View file

11

arch/arm/boot/dts/armada-xp.dtsi

View file

6

arch/arm/boot/dts/at91sam9x5.dtsi

View file

12

arch/arm/boot/dts/atlas6.dtsi

View file

5

arch/arm/boot/dts/exynos5250.dtsi

View file

6

arch/arm/boot/dts/imx27.dtsi

View file

2

arch/arm/boot/dts/imx51.dtsi

View file

4

arch/arm/boot/dts/imx6q-pinfunc.h

View file

3

arch/arm/boot/dts/kirkwood.dtsi

View file

2

arch/arm/boot/dts/omap3-beagle-xm.dts

View file

14

arch/arm/boot/dts/omap3-igep.dtsi

View file

4

arch/arm/boot/dts/omap3.dtsi

View file

46

arch/arm/boot/dts/omap4-panda-common.dtsi

View file

39

arch/arm/boot/dts/omap4-sdp.dts

View file

7

arch/arm/boot/dts/omap5.dtsi

View file

27

arch/arm/boot/dts/prima2.dtsi

View file

6

arch/arm/boot/dts/r8a73a4.dtsi

View file

1

arch/arm/boot/dts/r8a7778.dtsi

View file

1

arch/arm/boot/dts/r8a7779.dtsi

View file

9

arch/arm/boot/dts/r8a7790.dtsi

View file

6

arch/arm/boot/dts/sh73a0.dtsi

View file

14

arch/arm/boot/install.sh

View file

38

arch/arm/common/edma.c

View file

3

arch/arm/configs/multi_v7_defconfig

View file

6

arch/arm/crypto/aes-armv4.S

View file

2

arch/arm/include/asm/jump_label.h

View file

7

arch/arm/include/asm/uaccess.h

View file

4

arch/arm/kernel/entry-common.S

View file

8

arch/arm/kernel/entry-header.S

View file

6

arch/arm/kvm/reset.c

View file

2

arch/arm/mach-at91/at91rm9200_time.c

View file

2

arch/arm/mach-at91/at91sam926x_time.c

View file

8

arch/arm/mach-at91/at91sam9g45_reset.S

View file

2

arch/arm/mach-at91/at91x40_time.c

View file

2

arch/arm/mach-davinci/board-dm365-evm.c

View file

4

arch/arm/mach-davinci/include/mach/serial.h

View file

1

arch/arm/mach-imx/clk-fixup-mux.c

View file

2

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

View file

4

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

View file

9

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

View file

11

arch/arm/mach-imx/system.c

View file

7

arch/arm/mach-integrator/pci_v3.h

View file

8

arch/arm/mach-mvebu/coherency.c

View file

1

arch/arm/mach-mvebu/pmsu.c

View file

1

arch/arm/mach-mvebu/system-controller.c

View file

18

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

View file

9

arch/arm/mach-omap2/board-rx51-peripherals.c

View file

2

arch/arm/mach-omap2/cclock44xx_data.c

View file

2

arch/arm/mach-omap2/cpuidle44xx.c

View file

12

arch/arm/mach-omap2/gpmc-onenand.c

View file

4

arch/arm/mach-omap2/gpmc.c

View file

4

arch/arm/mach-omap2/mux.h

View file

2

arch/arm/mach-omap2/mux34xx.c

View file

2

arch/arm/mach-omap2/omap-smp.c

View file

2

arch/arm/mach-omap2/omap_device.c

View file

4

arch/arm/mach-omap2/timer.c

View file

2

arch/arm/mach-sa1100/collie.c

View file

4

arch/arm/mach-shmobile/board-armadillo800eva.c

View file

27

arch/arm/mach-shmobile/board-lager.c

View file

2

arch/arm/mach-shmobile/clock-r8a73a4.c

View file

2

arch/arm/mach-shmobile/clock-sh73a0.c

View file

10

arch/arm/mach-u300/Kconfig

View file

1

arch/arm/mach-ux500/cache-l2x0.c

View file

11

arch/arm/mach-vexpress/tc2_pm.c

View file

7

arch/arm64/Kconfig.debug

View file

5

arch/arm64/configs/defconfig

View file

2

arch/arm64/include/asm/hwcap.h

View file

10

arch/arm64/include/asm/uaccess.h

View file

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