regd.c Up the allowed power level for 5 GHz channels from 30 to 33
Merge remote-tracking branch 'origin/fedora-20' into ubuntu-14.04
Merge remote-tracking branch 'origin/ubuntu-14.04' into arch

Conflicts:
	regd.c