From: Colin Cross Date: Thu, 12 May 2011 21:08:42 +0000 (-0700) Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36 X-Git-Tag: firefly_0821_release~9833^2~7 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=f6874dc5e20d69bc5aed0d1b0edb7f9b902c8b04;p=firefly-linux-kernel-4.4.55.git Merge branch 'android-2.6.36' into android-tegra-2.6.36 --- f6874dc5e20d69bc5aed0d1b0edb7f9b902c8b04