d2b85a6 kernel-arm64.patch: fix up merge conflict and re-enable

Authored and Committed by Kyle McMartin 9 years ago
    kernel-arm64.patch: fix up merge conflict and re-enable
    
        
file modified
+244 -3312
file modified
+4 -1