From: Colin Cross <ccross@android.com>
Date: Thu, 21 Oct 2010 21:52:03 +0000 (-0700)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~145
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=677151f967dc7ced6840d420f69e15ed6ed3e553;p=firefly-linux-kernel-4.4.55.git

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

677151f967dc7ced6840d420f69e15ed6ed3e553