]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge tag 'integrator-v3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linus...
authorKevin Hilman <khilman@linaro.org>
Wed, 11 Dec 2013 15:37:23 +0000 (07:37 -0800)
committerKevin Hilman <khilman@linaro.org>
Wed, 11 Dec 2013 15:37:48 +0000 (07:37 -0800)
From Linus Walleij:
Two integrator device tree patches for v3.14:

- Delete some static core module mappings.

- Move EBI location to the device tree.

* tag 'integrator-v3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: integrator: move EBI to the device tree
  ARM: integrator: delete static core module mappings

Signed-off-by: Kevin Hilman <khilman@linaro.org>

Trivial merge