From: Colin Cross <ccross@android.com>
Date: Wed, 11 May 2011 02:20:23 +0000 (-0700)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5e1a8946bde3db838501b3372c60a8771a82c574;p=firefly-linux-kernel-4.4.55.git

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

5e1a8946bde3db838501b3372c60a8771a82c574