Public Git Hosting - linux-2.6.git/commit

commit	0792644d22852f40c8ad16c4ba1fefd76aba5643
author	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 4 Jun 2011 23:11:11 +0000 (5 08:11 +0900)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 4 Jun 2011 23:11:11 +0000 (5 08:11 +0900)
tree	70b4fe2757ca9fcaa1e94eb124c129aab1d6c890	tree \| snapshot (tar.gz zip)
parent	e6ece70732b905742ad91a7b5489e0ca1362c0cd	commit \| diff
parent	f2a4d8ae4d40f6f5482d207f47fd4d53b3ae0ed4	commit \| diff

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