kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-10-16 22:39:48 +00:00
Code Issues Releases Packages Activity

Merge branch 'late/kirkwood' into late/soc

Browse source 
Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.

Final contents described in shared tag.

Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2012-10-04 20:17:25 -07:00
commit 54d69df584
1489 changed files with 38629 additions and 40078 deletions
Download patch file Download diff file Expand all files Collapse all files

232
Documentation/arm/Marvell/README
View file

82
Documentation/arm/Samsung-S3C24XX/GPIO.txt
View file

8
Documentation/arm/Samsung/GPIO.txt
View file

3
Documentation/arm/memory.txt
View file

8
Documentation/devicetree/bindings/arm/bcm2835.txt
View file

17
Documentation/devicetree/bindings/arm/mrvl/tauros2.txt
View file

38
Documentation/devicetree/bindings/arm/msm/timer.txt
View file

3
Documentation/devicetree/bindings/arm/omap/omap.txt
View file

4
Documentation/devicetree/bindings/arm/pmu.txt
View file

76
Documentation/devicetree/bindings/clock/imx23-clock.txt
View file

99
Documentation/devicetree/bindings/clock/imx28-clock.txt
View file

222
Documentation/devicetree/bindings/clock/imx6q-clock.txt
View file

20
Documentation/devicetree/bindings/crypto/mv_cesa.txt
View file

25
Documentation/devicetree/bindings/gpio/gpio-fan.txt
View file

53
Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
View file

43
Documentation/devicetree/bindings/gpio/gpio-samsung.txt
View file

6
Documentation/devicetree/bindings/gpio/gpio-twl4030.txt
View file

1
Documentation/devicetree/bindings/i2c/trivial-devices.txt
View file

110
Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
View file

52
Documentation/devicetree/bindings/lpddr2/lpddr2-timings.txt
View file

102
Documentation/devicetree/bindings/lpddr2/lpddr2.txt
View file

55
Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
View file

31
Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt
View file

95
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
View file

100
Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
View file

72
Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt
View file

279
Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt
View file

46
Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt
View file

65
Documentation/devicetree/bindings/regulator/tps6586x.txt
View file

14
Documentation/devicetree/bindings/rtc/pxa-rtc.txt
View file

22
Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt
View file

1
Documentation/devicetree/bindings/vendor-prefixes.txt
View file

2
Documentation/spi/ep93xx_spi
View file

11
MAINTAINERS
View file

246
arch/arm/Kconfig
View file

33
arch/arm/Kconfig.debug
View file

150
arch/arm/Makefile
View file

2
arch/arm/boot/Makefile
View file

6
arch/arm/boot/compressed/misc.c
View file

106
arch/arm/boot/dts/Makefile
View file

60
arch/arm/boot/dts/am335x-bone.dts
View file

100
arch/arm/boot/dts/am335x-evm.dts
View file

71
arch/arm/boot/dts/am33xx.dtsi
View file

5
arch/arm/boot/dts/armada-370-xp.dtsi
View file

44
arch/arm/boot/dts/armada-370.dtsi
View file

4
arch/arm/boot/dts/armada-xp-db.dts
View file

57
arch/arm/boot/dts/armada-xp-mv78230.dtsi
View file

70
arch/arm/boot/dts/armada-xp-mv78260.dtsi
View file

70
arch/arm/boot/dts/armada-xp-mv78460.dtsi
View file

12
arch/arm/boot/dts/bcm2835-rpi-b.dts
View file

39
arch/arm/boot/dts/bcm2835.dtsi
View file

38
arch/arm/boot/dts/dove-cm-a510.dts
View file

42
arch/arm/boot/dts/dove-cubox.dts
View file

38
arch/arm/boot/dts/dove-dove-db.dts
View file

143
arch/arm/boot/dts/dove.dtsi
View file

109
arch/arm/boot/dts/ea3250.dts
View file

67
arch/arm/boot/dts/elpida_ecb240abacn.dtsi
View file

3
arch/arm/boot/dts/imx23-evk.dts
View file

57
arch/arm/boot/dts/imx23-olinuxino.dts
View file

2
arch/arm/boot/dts/imx23-stmp378x_devb.dts
View file

38
arch/arm/boot/dts/imx23.dtsi
View file

6
arch/arm/boot/dts/imx27-phytec-phycore.dts
View file

1
arch/arm/boot/dts/imx27.dtsi
View file

2
arch/arm/boot/dts/imx28-apx4devkit.dts
View file

99
arch/arm/boot/dts/imx28-cfa10049.dts
View file

29
arch/arm/boot/dts/imx28-evk.dts
View file

85
arch/arm/boot/dts/imx28-m28evk.dts
View file

23
arch/arm/boot/dts/imx28-tx28.dts
View file

123
arch/arm/boot/dts/imx28.dtsi
View file

44
arch/arm/boot/dts/imx51-babbage.dts
View file

146
arch/arm/boot/dts/imx51.dtsi
View file

59
arch/arm/boot/dts/imx53-ard.dts
View file

39
arch/arm/boot/dts/imx53-evk.dts
View file

42
arch/arm/boot/dts/imx53-qsb.dts
View file

46
arch/arm/boot/dts/imx53-smd.dts
View file

199
arch/arm/boot/dts/imx53.dtsi
View file

21
arch/arm/boot/dts/imx6q-arm2.dts
View file

31
arch/arm/boot/dts/imx6q-sabrelite.dts
View file

25
arch/arm/boot/dts/imx6q-sabresd.dts
View file

356
arch/arm/boot/dts/imx6q.dtsi
View file

10
arch/arm/boot/dts/kirkwood-dnskw.dtsi
View file

57
arch/arm/boot/dts/kirkwood-dockstar.dts
View file

50
arch/arm/boot/dts/kirkwood-iconnect.dts
View file

105
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
View file

29
arch/arm/boot/dts/kirkwood-km_kirkwood.dts
View file

12
arch/arm/boot/dts/kirkwood.dtsi
View file

5
arch/arm/boot/dts/mmp2.dtsi
View file

19
arch/arm/boot/dts/msm8660-surf.dts
View file

41
arch/arm/boot/dts/msm8960-cdp.dts
View file

2
arch/arm/boot/dts/omap2420-h4.dts
View file

48
arch/arm/boot/dts/omap2420.dtsi
View file

92
arch/arm/boot/dts/omap2430.dtsi
View file

54
arch/arm/boot/dts/omap3-beagle.dts → arch/arm/boot/dts/omap3-beagle-xm.dts
View file

13
arch/arm/boot/dts/omap3-evm.dts
View file

57
arch/arm/boot/dts/omap3-overo.dtsi
View file

35
arch/arm/boot/dts/omap3-tobi.dts
View file

94
arch/arm/boot/dts/omap3.dtsi
View file

25
arch/arm/boot/dts/omap36xx.dtsi
View file

11
arch/arm/boot/dts/omap4-panda.dts
View file

127
arch/arm/boot/dts/omap4-sdp.dts
View file

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