diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 12:49:26 +1000 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 12:49:26 +1000 |
commit | ef9f2fa17f3d6973a479a7677a023ee3604a52cb (patch) | |
tree | 6d4883210974774a4478f32f1306f0467717bb6f /drivers/input/keyboard/tnetv107x-keypad.c | |
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
Diffstat (limited to 'drivers/input/keyboard/tnetv107x-keypad.c')
0 files changed, 0 insertions, 0 deletions