From: Colin Cross <ccross@android.com>
Date: Fri, 29 Oct 2010 00:53:30 +0000 (-0700)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~137
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=245b304a888317dc03427972502c1c928bdc8548;p=firefly-linux-kernel-4.4.55.git

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

245b304a888317dc03427972502c1c928bdc8548