Merge branch 'master' of github.com:pathscale/envytools

Provide a fast-forward path from github.com:pathscale/envytools to this repo.

Conflicts:
	README
	rnndb/nv50_pclock.xml