| commit | e067096c8d57d191f29d734cd5692695c95cc36e | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Fri Jan 06 23:09:14 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Fri Jan 06 23:09:14 2012 +0000 |
| tree | e1c200404c3ed3730d04837113d59ca898eb483a | |
| parent | 1fc3eb81100c3f3cd44e706e54390151b0f1ce74 [diff] | |
| parent | e5570bbc9c06634cfac94e06ac1432b53d8595e5 [diff] |
Merge branch 'tegra/soc' into next/boards Conflicts: arch/arm/mach-tegra/board-harmony-pcie.c To fix an internal merge conflict between the tegra/soc and tegra/boards branches. Signed-off-by: Arnd Bergmann <arnd@arndb.de>