From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 8 Feb 2014 21:38:28 +0000 (-0800)
Subject: Merge branch 'staging-linus' into staging-work
X-Git-Tag: v3.15-rc1~139^2~1198
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ca363f6872bede71e486352885de3a88f4a3967;p=pandora-kernel.git

Merge branch 'staging-linus' into staging-work

This is to pull in the lustre fixes so that others can continue to work
on updating the lustre codebase, as well as resolve some merge issues
with the ion and ocproto drivers to keep linux-next happy.

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

7ca363f6872bede71e486352885de3a88f4a3967
Reading git-diff-tree failed