Merge branch 'mxs/saif' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Tue, 6 Dec 2011 14:23:35 +0000 (14:23 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 6 Dec 2011 14:23:35 +0000 (14:23 +0000)
commit3642a0a2c7d2d1949988d0fd004a8039c1f3d02f
treee687c88b1b66ad51a6a6c529f7f328f2d3b625fa
parent58a273745fbb2fbd01d26e7a60f0acc8c1d99469
parentb07fed455c883f07f8e847f5b0d79975b4dc8e7a
Merge branch 'mxs/saif' into next/drivers

Conflicts:
drivers/net/ethernet/cadence/Kconfig
arch/arm/Kconfig
arch/arm/mach-mmp/gplugd.c
arch/arm/mach-mmp/include/mach/gpio-pxa.h
arch/arm/mach-pxa/balloon3.c
arch/arm/mach-pxa/colibri-pxa320.c
arch/arm/mach-pxa/vpac270.c
drivers/net/ethernet/cadence/Kconfig