Merge branch 'next/cleanup-header' into for-next

diff --cc arch/arm/mach-exynos/common.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/h1940-bluetooth.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410-module.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/pm.c
Simple merge

diff --cc drivers/gpio/gpio-samsung.c
Simple merge