From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 13 Jun 2012 23:57:09 +0000 (-0700)
Subject: Merge branch 'staging-linus' into staging-next
X-Git-Tag: v3.6-rc1~100^2~798
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89a86a2da30a6a90dda719874092905cd762b7ef;p=pandora-kernel.git

Merge branch 'staging-linus' into staging-next

We need this for the pstore fixes that went into the staging-linus branch, so
that things apply properly for the pstore/android code merge.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

89a86a2da30a6a90dda719874092905cd762b7ef
Reading git-diff-tree failed