Merge branch 'tegra-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Colin Cross [Sat, 19 Feb 2011 22:35:16 +0000 (14:35 -0800)]

Trivial merge