| commit | 23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Sat Jan 07 20:53:13 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Sat Jan 07 20:53:13 2012 +0000 |
| tree | 60ab5e96f1e6e0ddd46eadf34d8a83ae2d8db72a | |
| parent | e195ffbe4573f79d590e63e2ae32dac2a73d5768 [diff] | |
| parent | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 [diff] |
Merge branch 'depends/rmk/for-linus' into next/soc Conflicts: arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/common.c