From: Erik Gilling <konkers@android.com>
Date: Fri, 25 Feb 2011 01:17:15 +0000 (-0800)
Subject: Merge remote branch android-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~31
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=01863b94e7ea138703dbcc3a0e5d49828a5cf4ff;p=firefly-linux-kernel-4.4.55.git

Merge remote branch android-2.6.36 into android-tegra-2.6.36

Change-Id: I1d7f83e8eb433df8076a9d636ff03e174a3ff581
---

01863b94e7ea138703dbcc3a0e5d49828a5cf4ff