tree 140a289a990e7810e9c365bce304af1e065ca649
parent 71f882fe71823c54ae095ce29ce050f814eefdbc
parent 364ed2f4653d7c86ebedcc116a9cb34fd272867c
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1339631829 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1339631829 -0700

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>