From: Erik Gilling <konkers@android.com>
Date: Wed, 3 Nov 2010 20:52:36 +0000 (-0700)
Subject: Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~129
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dc00fd520bb1059e8a351599d4379ee5f1a0eca3;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: Id52bf11ad517d9ebf5b68db4db15c006b82d75f9
---

dc00fd520bb1059e8a351599d4379ee5f1a0eca3