Merge branch 'for-linus' of git://android.kernel.org/kernel/tegra
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 21:48:44 +0000 (14:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 21:48:44 +0000 (14:48 -0700)
* 'for-linus' of git://android.kernel.org/kernel/tegra:
  [ARM] tegra: Add ZRELADDR default for ARCH_TEGRA


Trivial merge