Linux 3.0.58

Conflicts:

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