diff options
| author | Arnd Bergmann <[email protected]> | 2012-05-14 20:35:04 +0000 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2012-05-15 11:44:11 +0000 |
| commit | deb88cc3c69975cbd9875ed9fac259b351f6b64d (patch) | |
| tree | ece2ffba5c3e585cf649d73e4ea1784037335468 /tools/perf/util/trace-event-scripting.c | |
| parent | Merge branch 'for-3.5/dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/s... (diff) | |
| parent | mmc: dt: Consolidate DT bindings (diff) | |
| download | kernel-deb88cc3c69975cbd9875ed9fac259b351f6b64d.tar.gz kernel-deb88cc3c69975cbd9875ed9fac259b351f6b64d.zip | |
Merge branch 'drivers/mmc' into next/dt2
Changes in the dt2 branch move stuff around that gets changed
in the drivers/mmc branch. I chose a non-obvious resolution by
adding the new bus-width property into all the tegra sdhci device
nodes.
Conflicts:
arch/arm/boot/dts/tegra-cardhu.dts
arch/arm/boot/dts/tegra-harmony.dts
arch/arm/boot/dts/tegra-ventana.dts
Signed-off-by: Arnd Bergmann <[email protected]>
Diffstat (limited to 'tools/perf/util/trace-event-scripting.c')
0 files changed, 0 insertions, 0 deletions