From: Erik Gilling <konkers@android.com>
Date: Tue, 19 Apr 2011 20:36:37 +0000 (-0700)
Subject: Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~13
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f249634bf50fbfcd3b8730cb1a343bc3c59635ec;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: I023482f230dc4f413647f47b3c7c36fd4c98b97d
---

f249634bf50fbfcd3b8730cb1a343bc3c59635ec