From: Erik Gilling <konkers@android.com>
Date: Tue, 24 May 2011 22:41:54 +0000 (-0700)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e70a45d0e17f752d11d1d6bc8df29fdf12b80196;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: I80fdbf17c2e3a77be3ea63350191c8eab235ed94
---

e70a45d0e17f752d11d1d6bc8df29fdf12b80196