Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch

Conflicts:
	cmd/zdb/zdb_il.c
This commit is contained in:
Brian Behlendorf 2010-05-28 15:38:05 -07:00
commit d8f9623833
1 changed files with 1 additions and 1 deletions