From: Greg Kroah-Hartman Date: Thu, 4 Mar 2010 16:39:02 +0000 (-0800) Subject: Staging: merge staging patches into Linus's main branch X-Git-Tag: v2.6.34-rc1~10^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f341dddf1dadf64be309791f83d7904245f1261d;p=pandora-kernel.git Staging: merge staging patches into Linus's main branch There were a number of patches that went into Linus's tree already that conflicted with other changes in the staging branch. This merge resolves those merge conflicts. Signed-off-by: Greg Kroah-Hartman --- f341dddf1dadf64be309791f83d7904245f1261d Reading git-diff-tree failed