From: Erik Gilling <konkers@android.com>
Date: Wed, 27 Oct 2010 01:22:24 +0000 (-0700)
Subject: Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~140
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=588ff569ea3bd0b97666e88f146fc11da7bdb5b0;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: I0d4216b0a407e50c029a6c0869d727b188f7da04
---

588ff569ea3bd0b97666e88f146fc11da7bdb5b0