From: Dima Zavin <dima@android.com>
Date: Thu, 21 Oct 2010 22:00:17 +0000 (-0700)
Subject: Merge commit 'v2.6.36' into android-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~5^2~100
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5ff1b9cdb1791cab2759a2a073f0ba6b24579bc3;p=firefly-linux-kernel-4.4.55.git

Merge commit 'v2.6.36' into android-2.6.36
---

5ff1b9cdb1791cab2759a2a073f0ba6b24579bc3