summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-05 01:11:11 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-05 01:11:11 +0200
commit0792644d22852f40c8ad16c4ba1fefd76aba5643 (patch)
tree70b4fe2757ca9fcaa1e94eb124c129aab1d6c890 /drivers
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff)
parentARM: Tegra: Harmony: Fix conflicting GPIO numbering (diff)
downloadlinux-0792644d22852f40c8ad16c4ba1fefd76aba5643.tar.xz
linux-0792644d22852f40c8ad16c4ba1fefd76aba5643.zip
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