From: Colin Cross Date: Wed, 20 Oct 2010 21:35:05 +0000 (-0700) Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36 X-Git-Tag: firefly_0821_release~9833^2~148 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ae9a66ccf4bfcac9b6085cf9d62955f2712f82db;p=firefly-linux-kernel-4.4.55.git Merge branch 'android-2.6.36' into android-tegra-2.6.36 --- ae9a66ccf4bfcac9b6085cf9d62955f2712f82db