Linux 3.0.54
Linux 3.0.55
Linux 3.0.56
Linux 3.0.57
Linux 3.0.58
Linux 3.0.59

Conflicts:
	mm/compaction.c
Linux 3.0.60
Linux 3.0.61
merge error
another merge error fix