Merge branch 'for-linus' of git://android.kernel.org/kernel/tegra
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Aug 2010 17:05:57 +0000 (10:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Aug 2010 17:05:57 +0000 (10:05 -0700)
* 'for-linus' of git://android.kernel.org/kernel/tegra:
  [ARM] tegra: add MAINTAINERS entry
  [ARM] tegra: harmony: Add harmony board file
  [ARM] tegra: add pinmux support
  [ARM] tegra: add GPIO support
  [ARM] tegra: Add timer support
  [ARM] tegra: SMP support
  [ARM] tegra: Add clock support
  [ARM] tegra: Add IRQ support
  [ARM] tegra: initial tegra support

1  2 
MAINTAINERS
arch/arm/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge