sync
sync
sync
sync
sync
sync
sync
sync
sync
Merge branch 'master' into luis.henriques.ath-5424

Conflicts:
	dev/ic/ar5212.c
pull this diff, it conflicts with recent changes, and was never 'right' to begin with
sync
sync
Merge branch 'master' into luis.henriques.ath-5424
sync
sync
Merge branch 'master' into luis.henriques.ath-5424