From: Olof Johansson Date: Sun, 9 Mar 2014 06:53:33 +0000 (-0800) Subject: Merge tag 'integrator-for-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=22673b71689a65a89335d0f3e42ce952efb3e7e1;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'integrator-for-v3.15-2' of git://git./linux/kernel/git/linusw/linux-integrator into next/cleanup2 Merge more Integrator multiplatform patches for v3.15 from Linus Walleij: - Remove all dangling header files in from the global namespace and push them down into the mach-integrator folder. - Decouple the Integrator from the plat-versatile sched_clock implementation. * tag 'integrator-for-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: integrator: register sched_clock directly ARM: integrator: localize the hardware.h header ARM: integrator: merge platform.h to hardware.h ARM: integrator: localize the impd1.h header ARM: integrator: localize the lm.h header Signed-off-by: Olof Johansson --- 22673b71689a65a89335d0f3e42ce952efb3e7e1