Squashed update to 2.6.32.61

Conflicts:
	Makefile