]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb3fa25 f895567)
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 04:49:37 +0000 (14:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 04:49:37 +0000 (14:49 +1000)
commitde8ce0d42dfc71d8c827d324d71c085000349792
tree7a15f0e1857681947f1cbbff5ce06288d1d33f14tree | snapshot
parentfb3fa250bbf40d2a863f91e0a3da88c29985a313commit | diff
parentf8955671d47ec4277af428ae37e7d300ef118eadcommit | diff
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-imx/clk-imx51-imx53.c
arch/arm/mach-ux500/cpu-db8500.c
drivers/i2c/busses/i2c-omap.c
drivers/input/keyboard/omap-keypad.c
drivers/mmc/host/omap.c
drivers/mtd/nand/Kconfig
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/video/omap2/dss/dispc.c
drivers/w1/masters/omap_hdq.c
78 files changed:
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/Kconfig.debug diff1 | diff2 | blob | history
arch/arm/Makefile diff1 | diff2 | blob | history
arch/arm/boot/dts/imx51.dtsi diff1 | diff2 | blob | history
arch/arm/boot/dts/imx53.dtsi diff1 | diff2 | blob | history
arch/arm/boot/dts/imx6q.dtsi diff1 | diff2 | blob | history
arch/arm/configs/kzm9g_defconfig diff1 | diff2 | blob | history
arch/arm/include/asm/io.h diff1 | diff2 | blob | history
arch/arm/kernel/Makefile diff1 | diff2 | blob | history
arch/arm/mach-at91/at91rm9200_devices.c diff1 | diff2 | blob | history
arch/arm/mach-at91/at91sam9260_devices.c diff1 | diff2 | blob | history
arch/arm/mach-at91/at91sam9261_devices.c diff1 | diff2 | blob | history
arch/arm/mach-at91/at91sam9263.c diff1 | diff2 | blob | history
arch/arm/mach-at91/at91sam9263_devices.c diff1 | diff2 | blob | history
arch/arm/mach-at91/at91sam9rl_devices.c diff1 | diff2 | blob | history
arch/arm/mach-imx/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-imx/clk-imx51-imx53.c diff1 | diff2 | blob | history
arch/arm/mach-imx/mach-imx6q.c diff1 | diff2 | blob | history
arch/arm/mach-integrator/core.c diff1 | diff2 | blob | history
arch/arm/mach-integrator/integrator_ap.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-ams-delta.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-4430sdp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-am3517evm.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-cm-t35.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-omap4panda.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-overo.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-rx51-peripherals.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/mcbsp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_phy_internal.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/twl-common.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/twl-common.h diff1 | diff2 | blob | history
arch/arm/mach-omap2/usb-musb.c diff1 | diff2 | blob | history
arch/arm/mach-shmobile/board-armadillo800eva.c diff1 | diff2 | blob | history
arch/arm/mach-shmobile/board-kzm9g.c diff1 | diff2 | blob | history
arch/arm/mach-tegra/Makefile diff1 | diff2 | blob | history
arch/arm/mach-tegra/pcie.c diff1 | diff2 | blob | history
arch/arm/mach-u300/i2c.c diff1 | diff2 | blob | history
arch/arm/mm/cache-l2x0.c diff1 | diff2 | blob | history
arch/arm/mm/mmu.c diff1 | diff2 | blob | history
arch/powerpc/sysdev/fsl_msi.c diff1 | diff2 | blob | history
drivers/Makefile diff1 | diff2 | blob | history
drivers/clk/Makefile diff1 | diff2 | blob | history
drivers/dma/tegra20-apb-dma.c diff1 | diff2 | blob | history
drivers/gpio/gpio-pxa.c diff1 | diff2 | blob | history
drivers/i2c/busses/Kconfig diff1 | diff2 | blob | history
drivers/i2c/busses/i2c-omap.c diff1 | diff2 | blob | history
drivers/input/keyboard/omap-keypad.c diff1 | diff2 | blob | history
drivers/leds/Kconfig diff1 | diff2 | blob | history
drivers/leds/Makefile diff1 | diff2 | blob | history
drivers/media/platform/omap/omap_vout.c diff1 | diff2 | blob | history
drivers/media/platform/omap3isp/isp.c diff1 | diff2 | blob | history
drivers/mfd/db8500-prcmu.c diff1 | diff2 | blob | history
drivers/mmc/host/omap_hsmmc.c diff1 | diff2 | blob | history
drivers/mmc/host/sdhci-tegra.c diff1 | diff2 | blob | history
drivers/mtd/nand/ams-delta.c diff1 | diff2 | blob | history
drivers/mtd/nand/bcm_umi_nand.c diff1 | diff2 | blob | history
drivers/mtd/nand/omap2.c diff1 | diff2 | blob | history
drivers/mtd/nand/pxa3xx_nand.c diff1 | diff2 | blob | history
drivers/spi/spi-omap2-mcspi.c diff1 | diff2 | blob | history
drivers/staging/tidspbridge/core/wdt.c diff1 | diff2 | blob | history
drivers/usb/Kconfig diff1 | diff2 | blob | history
drivers/usb/host/Kconfig diff1 | diff2 | blob | history
drivers/usb/host/ohci-hcd.c diff1 | diff2 | blob | history
drivers/usb/host/ohci-nxp.c diff1 | diff2 | blob | history
drivers/video/omap2/dss/dispc.c diff1 | diff2 | blob | history
drivers/video/omap2/omapfb/omapfb-main.c diff1 | diff2 | blob | history
include/linux/leds.h diff1 | diff2 | blob | history
include/linux/mod_devicetable.h diff1 | diff2 | blob | history
sound/soc/omap/mcbsp.c diff1 | diff2 | blob | history
sound/soc/omap/omap-abe-twl6040.c diff1 | diff2 | blob | history
sound/soc/omap/omap-mcbsp.c diff1 | diff2 | blob | history
sound/soc/omap/omap-mcpdm.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules