commit | ef9f2fa17f3d6973a479a7677a023ee3604a52cb | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 31 12:49:26 2011 +1000 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 31 12:49:26 2011 +1000 |
tree | 6d4883210974774a4478f32f1306f0467717bb6f | |
parent | 1f0324caefd39985e9fe052fac97da31694db31e [diff] | |
parent | b48b5f51568977592f1bfce91c1c6378b0a5a4f5 [diff] |
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra * '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