From: Erik Gilling <konkers@android.com>
Date: Fri, 15 Apr 2011 22:56:26 +0000 (-0700)
Subject: Merge branch 'linux-tegra' into android-tegra
X-Git-Tag: firefly_0821_release~9833^2~14
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d99cea140dba998d7ee1a24a7d32ec1b78c02f3f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-tegra' into android-tegra
---

d99cea140dba998d7ee1a24a7d32ec1b78c02f3f