]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Jun 2011 23:11:11 +0000 (08:11 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Jun 2011 23:11:11 +0000 (08:11 +0900)
commit2bd3c5930fe06dc3f864c59c626900c2f167e48c
tree70b4fe2757ca9fcaa1e94eb124c129aab1d6c890
parentf9f2972dd27c4dccddefa5132b14787b0e288cf1
parent249aae3ef16373c468281c2eadae1844736fa9b8
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