| commit | d695cfa54e9ec48aeb149cadc8dab1240751572a | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sat Dec 17 20:05:50 2011 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Sat Dec 17 20:05:50 2011 -0800 |
| tree | 503d342f303181c4a8e4fb89e070117d5760c513 | |
| parent | c3e00a0eff4c05717915ac7a8e4646db3882aebf [diff] | |
| parent | 3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d [diff] |
Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc Conflicts: arch/arm/mach-tegra/board-dt.c Signed-off-by: Olof Johansson <olof@lixom.net>