Linux 3.0.90

Conflicts:

	arch/arm/configs/m0_00_defconfig

Conflicts:

	arch/arm/configs/shark-e_defconfig