Squashed update of kernel from 3.4.89 to 3.4.90

Signed-off-by: Javelin <javelinanddart@gmail.com>

Conflicts:
	drivers/ata/libata-core.c