Merge branch 'next/cleanup' into HEAD

Browse source

Conflicts:
	drivers/staging/tidspbridge/core/wdt.c
	drivers/usb/host/Kconfig
	drivers/w1/masters/omap_hdq.c

...

This commit is contained in:

Olof Johansson 2012-10-01 14:15:02 -07:00

parent 17a505edb0 9cf1c87152

commit ed0a0ed0a4

672 changed files with 10200 additions and 21072 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

82

Documentation/arm/Samsung-S3C24XX/GPIO.txt

View file

8

Documentation/arm/Samsung/GPIO.txt

View file

3

Documentation/arm/memory.txt

View file

4

Documentation/devicetree/bindings/arm/pmu.txt

View file

1

MAINTAINERS

View file

43

arch/arm/Kconfig

View file

1

arch/arm/Makefile

View file

2

arch/arm/boot/dts/imx27-phytec-phycore.dts

View file

220

arch/arm/boot/dts/tegra20-harmony.dts

View file

472

arch/arm/configs/pnx4008_defconfig

View file

7

arch/arm/configs/prima2_defconfig

View file

2

arch/arm/configs/tegra_defconfig

View file

12

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

View file

8

arch/arm/include/asm/io.h

View file

8

arch/arm/include/asm/mach/map.h

View file

13

arch/arm/include/asm/mach/pci.h

View file

9

arch/arm/include/asm/perf_event.h

View file

77

arch/arm/include/asm/pmu.h

View file

3

arch/arm/kernel/Makefile

View file

54

arch/arm/kernel/bios32.c

View file

347

arch/arm/kernel/perf_event.c

View file

295

arch/arm/kernel/perf_event_cpu.c

View file

12

arch/arm/kernel/perf_event_v6.c

View file

32

arch/arm/kernel/perf_event_v7.c

View file

10

arch/arm/kernel/perf_event_xscale.c

View file

36

arch/arm/kernel/pmu.c

View file

2

arch/arm/mach-at91/at91x40.c

View file

4

arch/arm/mach-at91/at91x40_time.c

View file

4

arch/arm/mach-at91/include/mach/hardware.h

View file

6

arch/arm/mach-at91/include/mach/uncompress.h

View file

4

arch/arm/mach-at91/setup.c

View file

5

arch/arm/mach-bcmring/arch.c

View file

3

arch/arm/mach-bcmring/core.c

View file

137

arch/arm/mach-bcmring/csp/chipc/chipcHw.c

View file

90

arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c

View file

19

arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c

View file

27

arch/arm/mach-bcmring/csp/dmac/dmacHw.c

View file

6

arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c

View file

6

arch/arm/mach-bcmring/csp/tmr/tmrHw.c

View file

13

arch/arm/mach-bcmring/include/cfg_global.h

View file

35

arch/arm/mach-bcmring/include/csp/cache.h

View file

36

arch/arm/mach-bcmring/include/csp/delay.h

View file

32

arch/arm/mach-bcmring/include/csp/errno.h

View file

40

arch/arm/mach-bcmring/include/csp/intcHw.h

View file

32

arch/arm/mach-bcmring/include/csp/module.h

View file

65

arch/arm/mach-bcmring/include/csp/secHw.h

View file

30

arch/arm/mach-bcmring/include/csp/stdint.h

View file

34

arch/arm/mach-bcmring/include/csp/string.h

View file

11

arch/arm/mach-bcmring/include/cfg_global_defines.h → arch/arm/mach-bcmring/include/mach/cfg_global.h

View file

2

arch/arm/mach-bcmring/include/mach/csp/cap_inline.h

View file

6

arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h

View file

119

arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h

View file

6

arch/arm/mach-bcmring/include/mach/csp/chipcHw_reg.h

View file

6

arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h

View file

4

arch/arm/mach-bcmring/include/csp/dmacHw.h → arch/arm/mach-bcmring/include/mach/csp/dmacHw.h

View file

2

arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h

View file

106

arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h

View file

2

arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h

View file

18

arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h

View file

2

arch/arm/mach-bcmring/include/mach/csp/mm_addr.h

View file

8

arch/arm/mach-bcmring/include/mach/csp/mm_io.h

View file

25

arch/arm/mach-bcmring/include/csp/reg.h → arch/arm/mach-bcmring/include/mach/csp/reg.h

View file

10

arch/arm/mach-bcmring/include/mach/csp/secHw_inline.h

View file

2

arch/arm/mach-bcmring/include/csp/tmrHw.h → arch/arm/mach-bcmring/include/mach/csp/tmrHw.h

View file

2

arch/arm/mach-bcmring/include/mach/dma.h

View file

2

arch/arm/mach-bcmring/include/mach/hardware.h

View file

2

arch/arm/mach-bcmring/include/mach/reg_nand.h

View file

4

arch/arm/mach-bcmring/include/mach/reg_umi.h

View file

4

arch/arm/mach-bcmring/mm.c

View file

2

arch/arm/mach-bcmring/timer.c

View file

10

arch/arm/mach-dove/common.c

View file

8

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

View file

19

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

View file

43

arch/arm/mach-dove/pcie.c

View file

8

arch/arm/mach-ebsa110/core.c

View file

12

arch/arm/mach-ebsa110/core.h

View file

9

arch/arm/mach-exynos/clock-exynos5.c

View file

1

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

View file

12

arch/arm/mach-footbridge/common.c

View file

16

arch/arm/mach-footbridge/dc21285.c

View file

3

arch/arm/mach-footbridge/include/mach/debug-macro.S

View file

12

arch/arm/mach-footbridge/include/mach/io.h

View file

2

arch/arm/mach-imx/Makefile

View file

1

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

View file

4

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

View file

49

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

View file

3

arch/arm/mach-imx/clk.c

View file

3

arch/arm/mach-imx/clk.h

View file

5

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

View file

2

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

View file

2

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

View file

4

arch/arm/mach-integrator/core.c

View file

8

arch/arm/mach-integrator/cpu.c

View file

33

arch/arm/mach-integrator/include/mach/io.h

View file

4

arch/arm/mach-integrator/include/mach/platform.h

View file

21

arch/arm/mach-integrator/integrator_ap.c

View file

6

arch/arm/mach-integrator/integrator_cp.c

View file

62

arch/arm/mach-integrator/pci_v3.c

View file

28

arch/arm/mach-iop13xx/include/mach/io.h

View file

48

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

View file

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