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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1075329 f55be1b)

author	Arnd Bergmann <arnd@arndb.de>
	Fri, 21 Oct 2011 14:47:34 +0000 (16:47 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Fri, 21 Oct 2011 14:47:34 +0000 (16:47 +0200)
commit	cc76557e39bf8c142176cef1ae72c72ee1dc084a
tree	b8e0cb33aa8af4317b781d0e19cf3ce7307e6932	tree \| snapshot
parent	107532920226a37e595697959b2a6a823cfa2497	commit \| diff
parent	f55be1bf52aad524dc1bf556ae26c90262c87825	commit \| diff

Merge branch 'depends/rmk/gpio' into next/devel

Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h

18 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91cap9_devices.c	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_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/da850.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/gplugd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/include/mach/gpio.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/dns323-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-paz00.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-trimslice-pinmux.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-trimslice.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/gpio.h	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-tegra.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/atmel_serial.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules