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>
	Mon, 12 Nov 2012 03:17:56 +0000 (14:17 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 12 Nov 2012 03:17:56 +0000 (14:17 +1100)
commit	6d99f44ef652b1b42426fcd34dd97fe4785d36e9
tree	24603a3e155f0d421d5f3b87c1a102833116e0c8	tree \| snapshot
parent	c25cc37521ebf9531df6c982c8f81599fcdfecff	commit \| diff
parent	9367622ffca46f1ed793a5212c6275717ced49fb	commit \| diff

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

Conflicts:
arch/arm/Kconfig
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-omap2/drm.c
arch/arm/mach-ux500/board-mop500-audio.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/cpu-db8500.c
drivers/pinctrl/pinctrl-nomadik.c

25 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/imx6q.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp_twd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx6q.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-nomadik/board-nhk8815.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/drm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pmu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu-db8500.c	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mfd/ab8500-core.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/db8500-prcmu.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/mxcmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-nomadik.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-mxc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-omap.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/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/imx6q.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp_twd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx6q.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-nomadik/board-nhk8815.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/drm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pmu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu-db8500.c	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mfd/ab8500-core.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/db8500-prcmu.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/mxcmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-nomadik.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-mxc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-omap.c	diff1 \|	diff2 \|	blob \| history