Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch

Conflicts: module/zfs/fletcher.c
2009-07-02 17:07:06 -07:00 · 2009-07-02 17:07:06 -07:00 · c66757e332
parent 091947219a a06a428e15
commit c66757e332
1 changed files with 0 additions and 1 deletions
--- a/module/zfs/fletcher.c
+++ b/module/zfs/fletcher.c
@ -124,7 +124,6 @@
 * For both cached and uncached data, both fletcher checksums are much faster
 * than sha-256, and slower than 'off', which doesn't touch the data at all.
 */
->>>>>>> gcc-c90:module/zfs/fletcher.c

 #include <sys/types.h>
 #include <sys/sysmacros.h>