From: Colin Cross <ccross@android.com>
Date: Wed, 12 Jan 2011 08:04:17 +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~177
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=139d6ef99eb9741923c5d3a23c26da3edab0d573;p=firefly-linux-kernel-4.4.55.git

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

139d6ef99eb9741923c5d3a23c26da3edab0d573