diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-09 07:53:33 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-09 07:53:33 +0100 |
| commit | 22673b71689a65a89335d0f3e42ce952efb3e7e1 (patch) | |
| tree | 0a5c5a7289d8522a0ccbe564fb74cdc6332a7afd /arch/arm/mach-zynq | |
| parent | Merge branch 'integrator/multiplatform-base' into next/cleanup2 (diff) | |
| parent | ARM: integrator: register sched_clock directly (diff) | |
| download | linux-22673b71689a65a89335d0f3e42ce952efb3e7e1.tar.xz linux-22673b71689a65a89335d0f3e42ce952efb3e7e1.zip | |
Merge tag 'integrator-for-v3.15-2' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'arch/arm/mach-zynq')
0 files changed, 0 insertions, 0 deletions