diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-26 09:27:27 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-26 09:27:31 (GMT) |
| commit | 61da823ab9f1e554da58f1c9f75931829582ad4f (patch) | |
| tree | bb55b966f3da3de6ff0ccad70fca3dc16c35786d /drivers/pcmcia | |
| parent | 0dfeada90989833d0144b4df25d2b9ce3746624f (diff) | |
| parent | 52cfa7e54b480661e20dfd8788a24cfcba8a0ca5 (diff) | |
| download | linux-61da823ab9f1e554da58f1c9f75931829582ad4f.tar.xz | |
Merge branch 'orion/dt' into next/dt
Merge in orion's cleanup branch together with the DT contents. Ideally
the cleanup branch should have been the base for the DT branch to avoid
these, but that was missed when first merging. So we're doing it now to
reduce the amount of silly conflicts due to internal tree organization.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions