Linux 3.0.58

Change-Id: I03dc1133d0c91efda5a0d090d281d290eb8ee9b7
Updates

Conflicts:
	drivers/input/touchscreen/synaptics_3200.c