| commit | 0f830e5c902106e7fe51460fd1e3263bea72bf41 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sun Feb 26 14:43:43 2012 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Sun Feb 26 14:43:43 2012 -0800 |
| tree | b83090bb272fce3ebda9aac311f2185ce78be7a3 | |
| parent | 9335e9199bd059fc4f5e4e6fcfb9fca1d482e460 [diff] | |
| parent | bdc93a77da75ee421125896ce4bbd91afff63809 [diff] |
Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp Conflicts: arch/arm/mach-tegra/Makefile