auto merge of #6325 : sammykim/rust/lint-name, r=graydon

author bors <bors@rust-lang.org>

Thu, 9 May 2013 15:54:38 +0000 (08:54 -0700)

committer bors <bors@rust-lang.org>

Thu, 9 May 2013 15:54:38 +0000 (08:54 -0700)
author bors <bors@rust-lang.org>
Thu, 9 May 2013 15:54:38 +0000 (08:54 -0700)
committer bors <bors@rust-lang.org>
Thu, 9 May 2013 15:54:38 +0000 (08:54 -0700)
diff --cc src/librustc/driver/session.rs
Simple merge
diff --cc src/librustc/middle/lint.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 9 May 2013 15:54:38 +0000 (08:54 -0700)
committer	bors <bors@rust-lang.org>
	Thu, 9 May 2013 15:54:38 +0000 (08:54 -0700)
		1	2
src/librustc/driver/session.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/middle/lint.rs	patch \|	diff1 \|	diff2 \|	blob \| history