git.karo-electronics.de Git - karo-tx-linux.git/commit

Merge branch 'next/boards' into for-next

* next/boards: (55 commits)
  ARM: imx_v4_v5_defconfig: Add VPU support
  ARM: imx: configs: enable netfilter support
  ARM: OMAP2+: Fix twl section warnings related to omap_twl4030_audio_init
  ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc
  RX-51: Register twl4030-madc device
  RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
  ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
  ARM: OMAP1: nokia770: enable CBUS/Retu
  ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator
  ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
  ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
  ARM: OMAP2+: craneboard: support the TPS65910 PMU
  ARM: OMAP2+: craneboard: support NAND device
  ARM: OMAP3: cm-t3517: add MMC support
  ARM: OMAP2+: Remove apollon board support
  ARM: shmobile: armadillo800eva: set clock rates before timer init
  ARM: tegra: defconfig updates
  ARM: shmobile: mackerel: Use gpio_request_one()
  ARM: shmobile: kzm9g: Use gpio_request_one()
  ARM: shmobile: bonito: Use gpio_request_one()
  ...

Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-apollon.c

author	Arnd Bergmann <arnd@arndb.de>
	Tue, 19 Feb 2013 16:02:46 +0000 (17:02 +0100)
committer	Arnd Bergmann <arnd@arndb.de>
	Tue, 19 Feb 2013 16:02:46 +0000 (17:02 +0100)
commit	d4a6b0e0dce67ecedde94ac61a1d44e1ba13957a
tree	4200e125d8d9caaf4971961d80d110e9b59e2396	tree \| snapshot
parent	c6f0f52868717d8abcd8a45a941d67f096e434b1	commit \| diff
parent	f628e3d92465303792d52c98fb0c95bef558f936	commit \| diff

arch/arm/configs/imx_v6_v7_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/omap2plus_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-da850-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-omapl138-hawk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-nokia770.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-3430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-am3517crane.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-cm-t35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-cm-t3517.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-devkit8000.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-igep0020.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3beagle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-overo.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/gpmc.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/twl-common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/palmtreo.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ag5evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ap4evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-armadillo800eva.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-bonito.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-kota2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-kzm9g.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-mackerel.c	diff1 \|	diff2 \|	blob \| history