]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 546fa55 c0cb413)
Merge branch 'depends/rmk/gpio' into next/fixes
authorArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 21:44:18 +0000 (22:44 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 21:44:18 +0000 (22:44 +0100)
commit2c399180f8e90d1b25e506cda2687208e57465d7
treedba464da61167d84b4f7470edebd5a769a78f9eetree | snapshot
parent546fa553292c3a64010b6567776ca774954c25e9commit | diff
parentc0cb4132cf671b451e32dcc8b99c9dcd2961f543commit | 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
Linux Kernel Source Tree.