Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata

Browse source

Conflicts:
	drivers/spi/spi-rspi.c

...

This commit is contained in:

Mark Brown 2013-08-29 13:59:05 +01:00

parent a1216394e6 8d4d08ce83

commit b5f9a9d511

977 changed files with 10375 additions and 98490 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

17

Documentation/ABI/testing/sysfs-driver-xen-blkback

View file

10

Documentation/ABI/testing/sysfs-driver-xen-blkfront

View file

37

Documentation/bcache.txt

View file

6

Documentation/cpu-hotplug.txt

View file

1

Documentation/devicetree/bindings/clock/imx27-clock.txt

View file

2

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

44

Documentation/ja_JP/HOWTO

View file

36

MAINTAINERS

View file

2

Makefile

View file

1

arch/alpha/Kconfig

View file

88

arch/alpha/include/asm/atomic.h

View file

8

arch/alpha/include/asm/param.h

View file

4

arch/alpha/include/asm/spinlock.h

View file

3

arch/alpha/include/asm/unistd.h

View file

7

arch/alpha/include/uapi/asm/param.h

View file

2

arch/alpha/include/uapi/asm/unistd.h

View file

399

arch/alpha/kernel/entry.S

View file

2

arch/alpha/kernel/irq_alpha.c

View file

15

arch/alpha/kernel/smp.c

View file

8

arch/alpha/kernel/sys_dp264.c

View file

3

arch/alpha/kernel/sys_marvel.c

View file

2

arch/alpha/kernel/systbls.S

View file

4

arch/alpha/kernel/time.c

View file

12

arch/alpha/kernel/traps.c

View file

3

arch/arm/Kconfig

View file

22

arch/arm/boot/dts/atlas6.dtsi

View file

2

arch/arm/boot/dts/imx28-apx4devkit.dts

View file

2

arch/arm/boot/dts/imx28-evk.dts

View file

2

arch/arm/boot/dts/imx28-m28evk.dts

View file

1

arch/arm/boot/dts/imx28.dtsi

View file

13

arch/arm/boot/dts/imx51-babbage.dts

View file

2

arch/arm/boot/dts/imx53-mba53.dts

View file

32

arch/arm/boot/dts/imx53.dtsi

View file

16

arch/arm/boot/dts/prima2.dtsi

View file

10

arch/arm/boot/dts/stih416-pinctrl.dtsi

View file

2

arch/arm/boot/dts/stih416.dtsi

View file

6

arch/arm/boot/dts/twl4030.dtsi

View file

8

arch/arm/boot/dts/vf610.dtsi

View file

1

arch/arm/common/edma.c

View file

4

arch/arm/common/mcpm_platsmp.c

View file

2

arch/arm/configs/da8xx_omapl_defconfig

View file

2

arch/arm/configs/davinci_all_defconfig

View file

6

arch/arm/configs/multi_v7_defconfig

View file

7

arch/arm/configs/nhk8815_defconfig

View file

2

arch/arm/include/asm/arch_timer.h

View file

1

arch/arm/kernel/head-common.S

View file

1

arch/arm/kernel/head-nommu.S

View file

1

arch/arm/kernel/head.S

View file

4

arch/arm/kernel/hw_breakpoint.c

View file

6

arch/arm/kernel/perf_event_cpu.c

View file

3

arch/arm/kernel/psci_smp.c

View file

18

arch/arm/kernel/smp.c

View file

6

arch/arm/kernel/smp_twd.c

View file

2

arch/arm/lib/delay.c

View file

2

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

View file

2

arch/arm/mach-davinci/dm355.c

View file

2

arch/arm/mach-davinci/dm365.c

View file

1

arch/arm/mach-exynos/Kconfig

View file

2

arch/arm/mach-exynos/Makefile

View file

26

arch/arm/mach-exynos/common.c

View file

1

arch/arm/mach-exynos/common.h

View file

1

arch/arm/mach-exynos/cpuidle.c

View file

2

arch/arm/mach-exynos/headsmp.S

View file

5

arch/arm/mach-exynos/include/mach/memory.h

View file

4

arch/arm/mach-exynos/platsmp.c

View file

6

arch/arm/mach-exynos/pm.c

View file

2

arch/arm/mach-footbridge/dc21285.c

View file

7

arch/arm/mach-highbank/highbank.c

View file

2

arch/arm/mach-highbank/platsmp.c

View file

5

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

View file

2

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

View file

2

arch/arm/mach-imx/mx27.h

View file

2

arch/arm/mach-imx/platsmp.c

View file

2

arch/arm/mach-keystone/keystone.c

View file

2

arch/arm/mach-keystone/platsmp.c

View file

2

arch/arm/mach-msm/headsmp.S

View file

6

arch/arm/mach-msm/platsmp.c

View file

4

arch/arm/mach-msm/timer.c

View file

2

arch/arm/mach-mvebu/coherency.c

View file

2

arch/arm/mach-mvebu/headsmp.S

View file

5

arch/arm/mach-mvebu/platsmp.c

View file

2

arch/arm/mach-omap2/Kconfig

View file

23

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

View file

2

arch/arm/mach-omap2/omap-headsmp.S

View file

2

arch/arm/mach-omap2/omap-mpuss-lowpower.c

View file

4

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

View file

4

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

View file

2

arch/arm/mach-prima2/headsmp.S

View file

4

arch/arm/mach-prima2/platsmp.c

View file

17

arch/arm/mach-pxa/em-x270.c

View file

3

arch/arm/mach-pxa/mainstone.c

View file

3

arch/arm/mach-pxa/pcm990-baseboard.c

View file

4

arch/arm/mach-pxa/poodle.c

View file

4

arch/arm/mach-pxa/spitz.c

View file

3

arch/arm/mach-pxa/stargate2.c

View file

2

arch/arm/mach-s3c24xx/Kconfig

View file

161

arch/arm/mach-s3c24xx/clock-s3c2410.c

View file

3

arch/arm/mach-s3c24xx/clock-s3c2440.c

View file

1

arch/arm/mach-shmobile/headsmp-scu.S

View file

2

arch/arm/mach-shmobile/headsmp.S

View file

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