diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-07 22:10:59 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-07 22:10:59 -0700 |
| commit | 5db3f620073d380a0421da66f4e3248e6deee024 (patch) | |
| tree | d15a8cac8d18108ceb40f468274fd30a0e8c4be1 /arch/arm/mach-integrator/common.h | |
| parent | e12f739e1145709692d973013451b777da011898 (diff) | |
| parent | 11c32d7b6274cb0f554943d65bd4a126c4a86dcd (diff) | |
Merge tag 'versatile-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup
Merge "First pull request of Versatile family clean-ups for v3.17" from Linus
Walleij:
- Remove <mach/memory.h> from the Integrator, paving the
road for multiplatform.
- Push the CLCD helper code down into the framebuffer subsystem,
removing the last hook in plat-versatile for the Integrator,
also paving the road for multiplatform.
Patches tested on Integrator/AP, Integrator/CP and Versatile AB
(all real hardware).
* tag 'versatile-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
video: move Versatile CLCD helpers
ARM: integrator: get rid of <mach/memory.h>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-integrator/common.h')
0 files changed, 0 insertions, 0 deletions