Update? I can't remember what I changed lol
Merge branch '3.0.x-td' of github.com:torrented/dna-kernel into 3.0.x-td

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c
	kerneltools-build-config