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

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

Change-Id: I870875673113113940a47d30010683e51b12a27b
---

e445bfcaf1ee8d0a43c6a4fd9e88073fd234ea89