diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 17:25:46 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 17:25:46 +0200 |
commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/um/drivers/pcap_user.c | |
parent | arm/dt: tegra devicetree support (diff) | |
parent | dmaengine: imx-sdma: add device tree probe support (diff) | |
download | linux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.xz linux-6124a4e430b64d1577438c8648c59e996d02e73e.zip |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/um/drivers/pcap_user.c')
0 files changed, 0 insertions, 0 deletions