Merge remote branch 'upstream/master'

Conflicts:
	package/mac80211/patches/561-ath9k-ar933x-usb-hang-workaround.patch

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@39408 3c298f89-4303-0410-b956-a3cf2f4a3e73