]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 20:47:41 +0000 (20:47 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 20:47:41 +0000 (20:47 +0000)
1  2 
arch/arm/mach-mmp/aspenite.c
arch/arm/mach-pxa/cm-x300.c
arch/arm/mach-pxa/littleton.c
arch/arm/mach-pxa/mxm8x10.c
arch/arm/mach-pxa/raumfeld.c
arch/arm/mach-pxa/zylonite.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge