tree 2573e6367e1806c298344fa023bb49a16cc4d1e4
parent 11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05
parent bca7ab316edd819edd0e3d59f9ccb26c6b2173f5
author Arnd Bergmann <arnd@arndb.de> 1320004749 +0100
committer Arnd Bergmann <arnd@arndb.de> 1320004749 +0100

Merge branch 'pxa/devel' into next/devel2

Conflicts:
	arch/arm/mach-s3c2416/s3c2416.c