kernel-3.x.x: remove the definition of unused tasklet_hi_enable, commits 7142637d, 06f66529 upstream
kernel-3.x.x: netfilter: nf_conntrack: constify sk_buff argument to nf_ct_attach(), commit 312a0c16 upstream
kernel-3.4.x: printk: Add printk_deferred_once, commit c224815d upstream
kernel-3.x.x: conntrack: improve offload skip logic, tidy. Add offload skip to xt_mark, xt_connmark targets
hw_nat: FoE entry range check, entry valid check, tidy
raeth: add 802.3az EEE control for MT7620 ESW, disable EEE by default for all PHY
rc, www: add 802.3az EEE control to userspace
ralink spi: fix write after unprotect bits clear, fix Winbond quad mode, add support new chips, tidy
ralink ehci: add workaround for embedded synopsys host controller
firmware version up
oops :()
kernel-3.4.x: update usb ehci/ohci platform driver, commits 1c1301dd, b6dd245c, 86e4cb35, 04216bed, e4d37aeb, ec03ad85, aece389e, 976baf6e, 2350cb0c upstream
kernel-3.4.x: ralink ehci/ohci: migrate to usb ehci/ohci platform driver
kernel-3.x.x: netfilter: nf_conntrack: allow server to become a client in TW handling, commit e37ad9fd upstream
kernel-3.x.x: qmi_wwan: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem, commit bb2bdeb8 upstream
kernel-3.4.x: ralink ehci/ohci: fix regression in [cf363d8d46f9]
rc,httpd: fix restart SMB server on some cases
fix show VHT rate for MT7612E (2T2R)
MT7610/MT7612: init rssi and snr stack vars
Merge remote-tracking branch 'upstream/master'

Conflicts:
	trunk/versions.inc