2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-12 15:44:01 +08:00
linux-next/arch/arm/mach-exynos/include
Arnd Bergmann 142f2101a8 Merge branch 'samsung/cleanup' into samsung/driver
Conflicts:
	arch/arm/mach-s5p64x0/cpu.c -> common.c

More changes to a file that got moved into common.c,
see previous conflict resolutions.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-09 16:14:07 +00:00
..
mach Merge branch 'samsung/cleanup' into samsung/driver 2012-01-09 16:14:07 +00:00