Merge tag 'integrator-for-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 06:53:33 +0000 (22:53 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 06:53:33 +0000 (22:53 -0800)
commit22673b71689a65a89335d0f3e42ce952efb3e7e1
tree0a5c5a7289d8522a0ccbe564fb74cdc6332a7afd
parentba0e1fa928e6e7a47d54008b1a701b02a858d0e4
parenta79528e9d849803457b6235ddb1a1cfd4e11c6cd
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 <mach/*> 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 <olof@lixom.net>