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

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

Change-Id: If54be4c2e106e24beb0ae3063156a0659fcbb943
---

8426dbfc3a189907ce3a309065ebd6126ac0d555