tree 51b626c0dc20c3c2992987929860a6d8c19a3003
parent 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae
parent d742aa152f27448d39ce65fb829e396d10cd63a9
author Benjamin Herrenschmidt <benh@kernel.crashing.org> 1385334267 +1100
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> 1385334267 +1100

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.
>>