include/linux/bitops.h: fix merge derp