Merge branch 'next/drivers' into HEAD

Browse source

Conflicts:
	arch/arm/boot/dts/omap4.dtsi
	arch/arm/mach-clps711x/common.c
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/leds-h2p2-debug.c
	arch/arm/mach-omap1/leds.c
	arch/arm/mach-pnx4008/time.c
	arch/arm/plat-omap/debug-leds.c
	drivers/Makefile
	drivers/bus/omap_l3_noc.c

...

This commit is contained in:

Olof Johansson 2012-10-01 14:33:55 -07:00

parent 5c008d7029 04ef037c92

commit 8b1a13b028

166 changed files with 5984 additions and 4618 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

10

Documentation/devicetree/bindings/bus/omap-ocp2scp.txt

View file

30

Documentation/devicetree/bindings/media/exynos5-gsc.txt

View file

196

Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt

View file

53

arch/arm/Kconfig

View file

457

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

View file

37

arch/arm/boot/dts/exynos4210.dtsi

View file

28

arch/arm/boot/dts/exynos5250.dtsi

View file

8

arch/arm/boot/dts/omap4.dtsi

View file

1

arch/arm/configs/afeb9260_defconfig

View file

2

arch/arm/configs/at91rm9200_defconfig

View file

2

arch/arm/configs/at91sam9261_defconfig

View file

3

arch/arm/configs/at91sam9263_defconfig

View file

2

arch/arm/configs/at91sam9g20_defconfig

View file

2

arch/arm/configs/at91sam9rl_defconfig

View file

2

arch/arm/configs/cpu9260_defconfig

View file

2

arch/arm/configs/cpu9g20_defconfig

View file

3

arch/arm/configs/qil-a9260_defconfig

View file

1

arch/arm/configs/stamp9g20_defconfig

View file

1

arch/arm/configs/usb-a9260_defconfig

View file

50

arch/arm/include/asm/leds.h

View file

1

arch/arm/kernel/Makefile

View file

121

arch/arm/kernel/leds.c

View file

6

arch/arm/kernel/process.c

View file

17

arch/arm/kernel/time.c

View file

90

arch/arm/mach-at91/at91rm9200_devices.c

View file

84

arch/arm/mach-at91/at91sam9260_devices.c

View file

60

arch/arm/mach-at91/at91sam9261_devices.c

View file

4

arch/arm/mach-at91/at91sam9263.c

View file

163

arch/arm/mach-at91/at91sam9263_devices.c

View file

60

arch/arm/mach-at91/at91sam9rl_devices.c

View file

14

arch/arm/mach-at91/board-afeb-9260v1.c

View file

14

arch/arm/mach-at91/board-carmeva.c

View file

17

arch/arm/mach-at91/board-cpu9krea.c

View file

13

arch/arm/mach-at91/board-cpuat91.c

View file

16

arch/arm/mach-at91/board-csb337.c

View file

14

arch/arm/mach-at91/board-eb9200.c

View file

32

arch/arm/mach-at91/board-ecbat91.c

View file

36

arch/arm/mach-at91/board-eco920.c

View file

14

arch/arm/mach-at91/board-flexibity.c

View file

16

arch/arm/mach-at91/board-foxg20.c

View file

17

arch/arm/mach-at91/board-kafa.c

View file

37

arch/arm/mach-at91/board-kb9202.c

View file

13

arch/arm/mach-at91/board-neocore926.c

View file

14

arch/arm/mach-at91/board-picotux200.c

View file

14

arch/arm/mach-at91/board-qil-a9260.c

View file

17

arch/arm/mach-at91/board-rm9200dk.c

View file

17

arch/arm/mach-at91/board-rm9200ek.c

View file

16

arch/arm/mach-at91/board-rsi-ews.c

View file

39

arch/arm/mach-at91/board-sam9-l9260.c

View file

16

arch/arm/mach-at91/board-sam9260ek.c

View file

16

arch/arm/mach-at91/board-sam9261ek.c

View file

13

arch/arm/mach-at91/board-sam9263ek.c

View file

16

arch/arm/mach-at91/board-sam9g20ek.c

View file

13

arch/arm/mach-at91/board-sam9rlek.c

View file

14

arch/arm/mach-at91/board-stamp9g20.c

View file

2

arch/arm/mach-at91/board-usb-a926x.c

View file

16

arch/arm/mach-at91/board-yl-9200.c

View file

1

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

View file

105

arch/arm/mach-at91/leds.c

View file

2

arch/arm/mach-clps711x/Makefile

View file

63

arch/arm/mach-clps711x/p720t-leds.c

View file

62

arch/arm/mach-clps711x/p720t.c

View file

4

arch/arm/mach-ebsa110/Makefile

View file

85

arch/arm/mach-ebsa110/leds.c

View file

2

arch/arm/mach-exynos/Kconfig

View file

86

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

View file

26

arch/arm/mach-exynos/common.c

View file

5

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

View file

8

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

View file

4

arch/arm/mach-footbridge/Makefile

View file

138

arch/arm/mach-footbridge/ebsa285-leds.c

View file

81

arch/arm/mach-footbridge/ebsa285.c

View file

112

arch/arm/mach-footbridge/netwinder-hw.c

View file

138

arch/arm/mach-footbridge/netwinder-leds.c

View file

3

arch/arm/mach-integrator/Makefile

View file

3

arch/arm/mach-integrator/core.c

View file

2

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

View file

171

arch/arm/mach-integrator/leds.c

View file

3

arch/arm/mach-ks8695/Makefile

View file

21

arch/arm/mach-ks8695/devices.c

View file

5

arch/arm/mach-ks8695/include/mach/devices.h

View file

92

arch/arm/mach-ks8695/leds.c

View file

8

arch/arm/mach-omap1/Makefile

View file

32

arch/arm/mach-omap1/board-h2.c

View file

32

arch/arm/mach-omap1/board-h3.c

View file

33

arch/arm/mach-omap1/board-osk.c

View file

169

arch/arm/mach-omap1/leds-h2p2-debug.c

View file

98

arch/arm/mach-omap1/leds-innovator.c

View file

113

arch/arm/mach-omap1/leds-osk.c

View file

70

arch/arm/mach-omap1/leds.c

View file

3

arch/arm/mach-omap1/leds.h

View file

1

arch/arm/mach-omap1/time.c

View file

1

arch/arm/mach-omap1/timer32k.c

View file

2

arch/arm/mach-omap2/Kconfig

View file

5

arch/arm/mach-omap2/Makefile

View file

1

arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c

View file

1

arch/arm/mach-orion5x/rd88f5181l-ge-setup.c

View file

72

arch/arm/mach-orion5x/rd88f5182-setup.c

View file

1

arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c

View file

8

arch/arm/mach-pxa/Makefile

View file

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