From: Colin Cross <ccross@android.com>
Date: Thu, 9 Jun 2011 23:56:27 +0000 (-0700)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=1dfd911585f4376e4859db0fbb26b8fb39cf0951;p=firefly-linux-kernel-4.4.55.git

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

1dfd911585f4376e4859db0fbb26b8fb39cf0951