]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Jan 2011 02:49:26 +0000 (12:49 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Jan 2011 02:49:26 +0000 (12:49 +1000)
* 'for-linus' of git://android.git.kernel.org/kernel/tegra:
  ARM: tegra: clock: Add forward reference to struct clk
  ARM: tegra: irq: Rename gic pointers to avoid conflicts
  arm/tegra: Fix tegra irq_data conversion


Trivial merge