diff options
author | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 14:55:23 +0000 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 14:55:23 +0000 |
commit | b757f17e9184b65428c48a281d82f9acb3e96f0e (patch) | |
tree | 7dc22c9f82f78c20caeff00fdd68a2e92e40504a /arch/arm/mach-s5pv210/setup-keypad.c | |
parent | 3c76a8a95daeecd881718f88324041f6a5faab86 (diff) | |
parent | da497f6fbaa190d34907ecc9dd85cfc62ba9f5a2 (diff) |
Merge tag 'tags/soc_for_v3.10' into mvebu/dt
Pulling in mvebu branches which contain changes to armada*.dts? files for LPAE
conversion.
mvebu soc changes for v3.10
- use the mvebu-mbus driver
- prep for LPAE support
Depends:
- mvebu/cleanup (tags/cleanup_for_v3.10)
- mvebu/drivers (tags/drivers_for_v3.10)
Diffstat (limited to 'arch/arm/mach-s5pv210/setup-keypad.c')
0 files changed, 0 insertions, 0 deletions