From: Colin Cross <ccross@android.com>
Date: Mon, 18 Oct 2010 23:19: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~151
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=11d35d77f93bf104a24a9d62fa0ac9b51b0c46f6;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: I200eea8eecc5afb9eb1595f2b5357315b0b14808
---

11d35d77f93bf104a24a9d62fa0ac9b51b0c46f6