From: Colin Cross <ccross@android.com>
Date: Sat, 12 Feb 2011 22:23:33 +0000 (-0800)
Subject: Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~118
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7aa771f81d2256ec480d12947bcae3f90519dd06;p=firefly-linux-kernel-4.4.55.git

Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
---

7aa771f81d2256ec480d12947bcae3f90519dd06