Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc
authorOlof Johansson <olof@lixom.net>
Sun, 18 Dec 2011 04:05:50 +0000 (20:05 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 18 Dec 2011 04:05:50 +0000 (20:05 -0800)
commitd695cfa54e9ec48aeb149cadc8dab1240751572a
tree503d342f303181c4a8e4fb89e070117d5760c513
parentc3e00a0eff4c05717915ac7a8e4646db3882aebf
parent3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d
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>
arch/arm/mach-tegra/board-dt.c