From: Erik Gilling <konkers@android.com>
Date: Wed, 5 Jan 2011 01:51:22 +0000 (-0800)
Subject: Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~76
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=00756cc5246293c02669eb9c13f2245f3cfa2706;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: Iec42f1fa234c03c6267f91ba0553d1c651b9ba94
---

00756cc5246293c02669eb9c13f2245f3cfa2706