Linux 3.0.64

Change-Id: Id535d176f113fcc4a3136bac822faa2f82e76338
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	Makefile