From: Erik Gilling <konkers@android.com>
Date: Thu, 7 Apr 2011 23:54:01 +0000 (-0700)
Subject: Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~17
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=30ff24c355ab4cc4f4794f285e1486e90a771d26;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: I0dea4f256442d7391808de8456fe35d3879682fe
---

30ff24c355ab4cc4f4794f285e1486e90a771d26