81c4dc5 Re-enable kernel-arm64.patch, and fix up merge conflicts with 3.18-rc4

Authored and Committed by Kyle McMartin 9 years ago
    Re-enable kernel-arm64.patch, and fix up merge conflicts with 3.18-rc4
    
        
file modified
+5 -1
file modified
+3 -0
file modified
+4849 -1813
file modified
+5 -2