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, 13 Nov 2012 04:20:24 +0000 (15:20 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Nov 2012 04:20:24 +0000 (15:20 +1100)
commit	4a9d25d370eecd22ce16313cbfde77ced4f07ae9
tree	32a4044b0eefb48ad965e618e72043b1e7f6b1f3	tree \| snapshot
parent	ab256872aee3bd521a0ed5d26caaa7790c302153	commit \| diff
parent	a89eeefe444dba6d53af8550a470a8d2ca24d544	commit \| diff

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

Conflicts:
arch/arm/Kconfig
arch/arm/configs/afeb9260_defconfig
arch/arm/configs/stamp9g20_defconfig
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/net/ethernet/cadence/at91_ether.c
drivers/pinctrl/pinctrl-nomadik.c
drivers/tty/serial/atmel_serial.c

50 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-at91/at91rm9200.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91rm9200_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9260.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9260_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9261.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/at91sam9g45.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9n12.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9rl.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9rl_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9x5.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/board-csb337.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/board-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/board-sam9g20ek.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/board.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/setup.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-u300/core.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/net/ethernet/cadence/at91_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-nomadik.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/atmel_serial.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-at91.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/am35x.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_dsps.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-at91/at91rm9200.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91rm9200_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9260.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9260_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9261.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/at91sam9g45.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9n12.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9rl.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9rl_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9x5.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/board-csb337.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/board-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/board-sam9g20ek.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/board.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/setup.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-u300/core.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/net/ethernet/cadence/at91_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-nomadik.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/atmel_serial.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-at91.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/am35x.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_dsps.c	diff1 \|	diff2 \|	blob \| history