projects / linux-flexiantxendom0.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6ece70 f2a4d8a)
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)
* 'for-linus' of git://android.git.kernel.org/kernel/tegra:
  ARM: Tegra: Harmony: Fix conflicting GPIO numbering


Trivial merge
Port of xen3.3 xenlinux code to Ubuntu Precise kernel (3.2)