git.openwrt.org Git - openwrt/staging/blogic.git/commit

Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc

* 'next/devel' of git://git.linaro.org/people/arnd/arm-soc: (50 commits)
  ARM: tegra: update defconfig
  arm/tegra: Harmony: Configure PMC for low-level interrupts
  arm/tegra: device tree support for ventana board
  arm/tegra: add support for ventana pinmuxing
  arm/tegra: prepare Seaboard pinmux code for derived boards
  arm/tegra: pinmux: ioremap registers
  gpio/tegra: Convert to a platform device
  arm/tegra: Convert pinmux driver to a platform device
  arm/dt: Tegra: Add pinmux node to tegra20.dtsi
  arm/tegra: Prep boards for gpio/pinmux conversion to pdevs
  ARM: mx5: fix clock usage for suspend
  ARM i.MX entry-macro.S: remove now unused code
  ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER
  ARM i.MX tzic: add handle_irq function
  ARM i.MX avic: add handle_irq function
  ARM: mx25: Add the missing IIM base definition
  ARM i.MX avic: convert to use generic irq chip
  mx31moboard: Add poweroff support
  ARM: mach-qong: Add watchdog support
  ARM: davinci: AM18x: Add wl1271/wlan support
  ...

Fix up conflicts in:
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/plat-mxc/include/mach/memory.h

author	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 2 Nov 2011 03:31:25 +0000 (20:31 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 2 Nov 2011 03:31:25 +0000 (20:31 -0700)
commit	16ee792e45cf0c97ce061fce03c36cab5551ec72
tree	dc68af705fbac4b5d71325aa972730199bb187dd	tree \| snapshot
parent	f906fb1d70e016726fccfb0d978c5d425503db9d	commit \| diff
parent	efa62e1355f0495f37f1296754b8880947c8da72	commit \| diff

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9260_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-da850-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-armadillo5x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx27.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-eukrea_cpuimx25.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27_visstrim_m10.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27ipcam.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-kzm_arm11_01.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx1ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx21ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx25_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31lilly.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31moboard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx35_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mxt_td60.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pca100.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm037.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm038.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm043.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-qong.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-scb9328.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-cpuimx51.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-cpuimx51sd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_babbage.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_efikamx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_efikasb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/clock-mx28.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-mx23evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-mx28evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-tx28.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/Makefile.boot	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-paz00-pinmux.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-seaboard-pinmux.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/Kconfig	diff1 \|	diff2 \|	blob \| history