From: Erik Gilling <konkers@android.com>
Date: Thu, 3 Feb 2011 21:29:42 +0000 (-0800)
Subject: Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~43
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a979d00287bcd3297bd13a59534073e6faa570c9;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: I65d011f4a13d99ffc617a807d551d5869b739662
---

a979d00287bcd3297bd13a59534073e6faa570c9