From: Greg Kroah-Hartman Date: Wed, 10 Nov 2010 00:12:37 +0000 (-0800) Subject: Staging: Merge Ben Collins solo6x10 tree with upstream X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=050afc92ee394ccdd953f91dcbbf9af863af8efc;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Staging: Merge Ben Collins solo6x10 tree with upstream There were some duplicate changes that needed to be hand-merged due to fixes needed to keep .37 building and working properly. Signed-off-by: Greg Kroah-Hartman --- 050afc92ee394ccdd953f91dcbbf9af863af8efc