rc: add delay after interface up under WISP mode
APSoC wireless driver: add support 64 bit interface counters, tidy
APSoC wireless driver: backport ApCliRcvBeaconTime fix from 3.x.x.x driver
PCIe wireless driver: add support 64 bit interface counters, tidy
httpd: show traffic counters under WISP mode
RT-N11P target: allow pagecache reclaim
kernel-3.x.x: net: core: Remove redundant call to 'nf_reset' in 'dev_forward_skb', commit a561cf7e upstream
kernel-3.x.x: Revert 'ipv4: move route garbage collector to work queue'
kernel-3.x.x: remove -fno-reorder-blocks for usual case (improve performance)
RT-N11P target: tune CE SKU table to +2dBm
RT-AC51U target: tune CE 2.4GHz SKU table to +2dBm
firmware version up
build_firmware: do not vanish CONFIG_PAGECACHE_RECLAIM
Merge upstream
Merge remote-tracking branch 'upstream/master'

Conflicts:
	trunk/versions.inc