summaryrefslogtreecommitdiff
path: root/sound/synth
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-07-08 05:10:59 (GMT)
committerOlof Johansson <olof@lixom.net>2014-07-08 05:10:59 (GMT)
commit5db3f620073d380a0421da66f4e3248e6deee024 (patch)
treed15a8cac8d18108ceb40f468274fd30a0e8c4be1 /sound/synth
parente12f739e1145709692d973013451b777da011898 (diff)
parent11c32d7b6274cb0f554943d65bd4a126c4a86dcd (diff)
downloadlinux-5db3f620073d380a0421da66f4e3248e6deee024.tar.xz
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 'sound/synth')
0 files changed, 0 insertions, 0 deletions