Remove some merge derps

Remove double existing parts from drivers/wireles and fs/jbd and fs/jbd2.