From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun, 24 Nov 2013 23:04:27 +0000 (+1100)
Subject: Merge remote-tracking branch 'scott/master' into merge
X-Git-Tag: v3.13-rc2~23^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=02ce6e879eb6f260ee48e822f20b94c360fdd4d3;p=users%2Fwilly%2Flinux.git

Merge remote-tracking branch 'scott/master' into merge

Scott wrote:

<<
The corenet64 patch fixes a regression introduced in 3.13-rc1 (commit
ef1313deafb7baa6d3382044e962d5ad5e8c8dd6, "powerpc: Add VMX optimised xor
for RAID5").

The 8xx patch fixes a regression introduced in 3.12 (commit
beb2dc0a7a84be003ce54e98b95d65cc66e6e536, "powerpc: Convert some
mftb/mftbu into mfspr").

The other two patches are fixes for minor, long standing bugs.
>>
---

02ce6e879eb6f260ee48e822f20b94c360fdd4d3