summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-05 08:11:11 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-05 08:11:11 +0900
commit0792644d22852f40c8ad16c4ba1fefd76aba5643 (patch)
tree70b4fe2757ca9fcaa1e94eb124c129aab1d6c890 /drivers
parente6ece70732b905742ad91a7b5489e0ca1362c0cd (diff)
parentf2a4d8ae4d40f6f5482d207f47fd4d53b3ae0ed4 (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: Harmony: Fix conflicting GPIO numbering
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions