5da751d 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
+74 -2361
file modified
+4 -1