From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Jun 2011 23:11:11 +0000 (+0900)
Subject: Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0792644d22852f40c8ad16c4ba1fefd76aba5643;p=deliverable%2Flinux.git

Merge branch 'for-linus' of git://android.git./kernel/tegra

* 'for-linus' of git://android.git.kernel.org/kernel/tegra:
  ARM: Tegra: Harmony: Fix conflicting GPIO numbering
---

0792644d22852f40c8ad16c4ba1fefd76aba5643