Linux 3.4.25

Conflicts:
	arch/cris/include/asm/io.h
	arch/sparc/include/asm/hugetlb.h