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

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Jul 2011 01:24:52 +0000 (11:24 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Jul 2011 01:24:52 +0000 (11:24 +1000)
commit	74159c53b1881eeb66372d8360c46af85c8875fe
tree	111fce159af011b55120dd5faa118acf6fba725e	tree \| snapshot
parent	fa9550d2b79209e0b22c6d88770e3d93a3272a2f	commit \| diff
parent	529dad2831ac0813f0b0f81eff1a3b804616a704	commit \| diff

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-exynos4/pm.c
arch/microblaze/include/asm/pci-bridge.h

40 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/common/gic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-da850-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/pm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/common-pci.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mv78xx0/pcie.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/clock-mx51-mx53.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/cm-x2xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/palmz72.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/pxa3xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/raumfeld.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/zeus.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-seaboard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-trimslice-pinmux.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-mop500-regulators.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/proc-xsc3.S	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/omap_device.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/irq-uart.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/pm.c	diff1 \|	diff2 \|	blob \| history
arch/microblaze/include/asm/pci-bridge.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/pci-bridge.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/pci.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/pci-common.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/pci_32.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/52xx/mpc52xx_pci.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/chrp/pci.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/powermac/pci.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/fsl_pci.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/ppc4xx_pci.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/twl6040.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/common/gic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-da850-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/pm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/common-pci.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mv78xx0/pcie.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/clock-mx51-mx53.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/cm-x2xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/palmz72.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/pxa3xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/raumfeld.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/zeus.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-seaboard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-trimslice-pinmux.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-mop500-regulators.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/proc-xsc3.S	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/omap_device.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/irq-uart.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/pm.c	diff1 \|	diff2 \|	blob \| history
arch/microblaze/include/asm/pci-bridge.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/pci-bridge.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/pci.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/pci-common.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/pci_32.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/52xx/mpc52xx_pci.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/chrp/pci.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/powermac/pci.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/fsl_pci.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/ppc4xx_pci.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/twl6040.c	diff1 \|	diff2 \|	blob \| history