diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 00:35:04 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 15:44:11 +0400 |
| commit | deb88cc3c69975cbd9875ed9fac259b351f6b64d (patch) | |
| tree | ece2ffba5c3e585cf649d73e4ea1784037335468 /Documentation/kprobes.txt | |
| parent | ecf1b318347f6c250293ee8a9f2597373b00e0c3 (diff) | |
| parent | 7f217794ffa72f208a250b79ab0b7ea3de19677f (diff) | |
| download | linux-deb88cc3c69975cbd9875ed9fac259b351f6b64d.tar.xz | |
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 <arnd@arndb.de>
Diffstat (limited to 'Documentation/kprobes.txt')
0 files changed, 0 insertions, 0 deletions