git.stricted.de - GitHub/LineageOS/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit

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

author	Arnd Bergmann <arnd@arndb.de>
	Mon, 31 Oct 2011 21:44:18 +0000 (22:44 +0100)
committer	Arnd Bergmann <arnd@arndb.de>
	Mon, 31 Oct 2011 21:44:18 +0000 (22:44 +0100)
commit	43872fa788060eef91ae437957e0a5e39f1c56fd
tree	dba464da61167d84b4f7470edebd5a769a78f9ee	tree \| snapshot (tar.gz zip)
parent	91fed558d0f33c74477569f50ed883fe6d430f1f	commit \| diff
parent	f55be1bf52aad524dc1bf556ae26c90262c87825	commit \| diff

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

This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

14 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/gplugd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/include/mach/gpio-pxa.h	\|	diff2 \|	blob \| history
arch/arm/mach-mmp/mmp2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/dns323-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/include/mach/gpio-pxa.h	\|	diff2 \|	blob \| history
arch/arm/mach-pxa/irq.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lpd270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/pxa25x.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/pxa27x.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/pxa3xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saarb.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-pxa.c	\|	diff2 \|	blob \| history
drivers/tty/serial/atmel_serial.c	diff1 \|	diff2 \|	blob \| history