From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 28 Oct 2010 16:44:56 +0000 (-0700)
Subject: Merge 'staging-next' to Linus's tree
X-Git-Tag: v2.6.37-rc1~60^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7;p=pandora-kernel.git

Merge 'staging-next' to Linus's tree

This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7
Reading git-diff-tree failed