sdc.s: Fix merge problem
authorAlan Cox <alan@linux.intel.com>
Fri, 21 Apr 2017 15:43:29 +0000 (16:43 +0100)
committerAlan Cox <alan@linux.intel.com>
Fri, 21 Apr 2017 15:43:29 +0000 (16:43 +0100)
commitf77395c3a1ab7549659b625c1388c81e5a05baa0
tree08bba3433c3e74cf85216946a9705ab386679aa2
parent34831996edd295972c51344cb678b76edc15f938
sdc.s: Fix merge problem
Kernel/platform-coco2cart/sdc.s