From: Erik Gilling <konkers@android.com>
Date: Fri, 12 Nov 2010 02:12:08 +0000 (-0800)
Subject: Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~114
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1730a615ef7ff48c40c3dd55296df8c580072850;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: I15e4d0a951e48c27e8f155e94c19f8fbe37131a0
---

1730a615ef7ff48c40c3dd55296df8c580072850