Conflicts:
	.gitignore
	feeds.conf.default
	include/kernel-build.mk
	include/kernel-defaults.mk
	include/kernel-version.mk
	include/kernel.mk
	include/netfilter.mk
	include/toplevel.mk
	include/verbose.mk
	include/version.mk
	package/base-files/Makefile
	package/base-files/files/etc/banner
	package/base-files/files/etc/config/system
	package/base-files/files/etc/init.d/boot
	package/base-files/files/etc/init.d/sysfixtime
	package/base-files/files/etc/sysctl.conf
	package/base-files/image-config.in
	package/boot/uboot-envtools/Makefile
	package/devel/binutils/Makefile
	package/kernel/acx-mac80211/Makefile
	package/kernel/ar7-atm/Makefile
	package/kernel/avila-wdt/Makefile
	package/kernel/broadcom-wl/Makefile
	package/kernel/button-hotplug/Makefile
	package/kernel/ep80579-drivers/Makefile
	package/kernel/gpio-button-hotplug/Makefile
	package/kernel/hostap-driver/Makefile
	package/kernel/i2c-gpio-custom/Makefile
	package/kernel/lantiq/ltq-adsl-mei/Makefile
	package/kernel/lantiq/ltq-adsl/Makefile
	package/kernel/lantiq/ltq-atm/Makefile
	package/kernel/lantiq/ltq-deu/Makefile
	package/kernel/lantiq/ltq-hcd/Makefile
	package/kernel/lantiq/ltq-ifxos/Makefile
	package/kernel/lantiq/ltq-ptm/Makefile
	package/kernel/lantiq/ltq-tapi/Makefile
	package/kernel/lantiq/ltq-vdsl-mei/Makefile
	package/kernel/lantiq/ltq-vdsl/Makefile
	package/kernel/lantiq/ltq-vmmc/Config.in
	package/kernel/lantiq/ltq-vmmc/Makefile
	package/kernel/linux/Makefile
	package/kernel/linux/modules/block.mk
	package/kernel/linux/modules/can.mk
	package/kernel/linux/modules/firewire.mk
	package/kernel/linux/modules/fs.mk
	package/kernel/linux/modules/hwmon.mk
	package/kernel/linux/modules/input.mk
	package/kernel/linux/modules/leds.mk
	package/kernel/linux/modules/lib.mk
	package/kernel/linux/modules/netdevices.mk
	package/kernel/linux/modules/netfilter.mk
	package/kernel/linux/modules/netsupport.mk
	package/kernel/linux/modules/other.mk
	package/kernel/linux/modules/spi.mk
	package/kernel/linux/modules/usb.mk
	package/kernel/linux/modules/video.mk
	package/kernel/linux/modules/w1.mk
	package/kernel/linux/modules/wireless.mk
	package/kernel/mac80211/Makefile
	package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
	package/kernel/mac80211/files/lib/wifi/mac80211.sh
	package/kernel/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
	package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
	package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch
	package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
	package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
	package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
	package/kernel/mmc_over_gpio/Makefile
	package/kernel/mt76/Makefile
	package/kernel/mwlwifi/Makefile
	package/kernel/rotary-gpio-custom/Makefile
	package/kernel/rtc-rv5c386a/Makefile
	package/kernel/spi-gpio-custom/Makefile
	package/kernel/trelay/Makefile
	package/kernel/w1-gpio-custom/Makefile
	package/kernel/wrt55agv2-spidevs/Makefile
	package/libs/libmnl/Makefile
	package/libs/libnfnetlink/Makefile
	package/libs/librpc/Makefile
	package/libs/openssl/Makefile
	package/libs/openssl/patches/160-disable_doc_tests.patch
	package/libs/openssl/patches/190-remove_timestamp_check.patch
	package/libs/openssl/patches/200-parallel_build.patch
	package/libs/popt/Makefile
	package/libs/toolchain/Makefile
	package/libs/uclibc++/Makefile
	package/network/config/firewall/Makefile
	package/network/config/firewall/files/firewall.config
	package/network/ipv6/odhcp6c/Makefile
	package/network/ipv6/odhcp6c/files/dhcpv6.script
	package/network/services/dnsmasq/Makefile
	package/network/services/dropbear/Makefile
	package/network/services/hostapd/Makefile
	package/network/services/mdns/files/mdns.init
	package/network/services/odhcpd/Makefile
	package/network/services/samba36/Makefile
	package/network/services/uhttpd/Makefile
	package/network/utils/comgt/Makefile
	package/network/utils/curl/Config.in
	package/network/utils/curl/patches/200-no_docs_tests.patch
	package/network/utils/ipset/Makefile
	package/network/utils/iptables/Makefile
	package/system/opkg/Makefile
	package/system/procd/Makefile
	package/system/ubox/Makefile
	package/utils/busybox/Config-defaults.in
	package/utils/busybox/Makefile
	package/utils/nvram/src/cli.c
	package/utils/nvram/src/nvram.c
	package/utils/nvram/src/nvram.h
	package/utils/otrx/src/otrx.c
	scripts/download.pl
	scripts/feeds
	scripts/ipkg-make-index.sh
	target/linux/ar71xx/base-files/etc/diag.sh
	target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
	target/linux/ar71xx/base-files/etc/uci-defaults/02_network
	target/linux/ar71xx/base-files/lib/ar71xx.sh
	target/linux/ar71xx/base-files/lib/upgrade/platform.sh
	target/linux/ar71xx/config-3.18
	target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr720n-v3.c
	target/linux/ar71xx/generic/profiles/compex.mk
	target/linux/ar71xx/image/Makefile
	target/linux/ar71xx/patches-3.18/425-net-phy-at803x-allow-to-configure-via-pdata.patch
	target/linux/ar71xx/patches-3.18/460-spi-bitbang-export-spi_bitbang_bufs.patch
	target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
	target/linux/ar71xx/patches-3.18/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch
	target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
	target/linux/ar71xx/patches-3.18/736-MIPS-ath79-add-MC-MAC1200R-support.patch
	target/linux/ar71xx/patches-3.18/737-MIPS-ath79-add-om5p-an-support.patch
	target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch
	target/linux/ar71xx/patches-3.18/800-MIPS-ath79-add-RB922GS-support.patch
	target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch
	target/linux/ar71xx/patches-3.18/903-MIPS-ath79-ubnt-rocket-m-xw-support.patch
	target/linux/at91/base-files/lib/preinit/03_preinit_do_at91.sh
	target/linux/at91/config-default
	target/linux/at91/sama5d3/target.mk
	target/linux/au1000/image/Makefile
	target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c
	target/linux/bcm53xx/patches-3.18/063-ARM-BCM5301X-Ignore-another-BCM4709-specific-fault-c.patch
	target/linux/bcm53xx/patches-3.18/064-ARM-BCM5301X-add-NAND-flash-chip-description.patch
	target/linux/bcm53xx/patches-3.18/065-ARM-BCM5301X-add-IRQ-numbers-for-PCIe-controller.patch
	target/linux/bcm53xx/patches-3.18/066-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch
	target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch
	target/linux/bcm53xx/patches-3.18/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch
	target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch
	target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-back-Luxul-XWC-1000-NAND-flash-layo.patch
	target/linux/brcm2708/patches-3.18/0004-Add-dwc_otg-driver.patch
	target/linux/brcm2708/patches-3.18/0055-usb-core-make-overcurrent-messages-more-prominent.patch
	target/linux/brcm47xx/patches-3.18/032-01-MIPS-BCM47XX-Make-sure-NVRAM-buffer-ends-with-0.patch
	target/linux/brcm47xx/patches-3.18/032-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch
	target/linux/brcm47xx/patches-3.18/032-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch
	target/linux/brcm47xx/patches-3.18/032-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch
	target/linux/brcm47xx/patches-3.18/032-05-MIPS-BCM47xx-Read-board-info-for-all-bcma-buses.patch
	target/linux/brcm47xx/patches-3.18/032-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch
	target/linux/brcm47xx/patches-3.18/032-07-MIPS-BCM47XX-Support-Luxul-XWR-1750-board.patch
	target/linux/brcm47xx/patches-3.18/032-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch
	target/linux/brcm47xx/patches-3.18/032-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch
	target/linux/brcm47xx/patches-3.18/032-10-MIPS-BCM47xx-Don-t-select-BCMA_HOST_PCI.patch
	target/linux/brcm63xx/dts/a4001n.dts
	target/linux/brcm63xx/patches-3.18/499-allow_better_context_for_board_patches.patch
	target/linux/brcm63xx/patches-3.18/500-board-D4PW.patch
	target/linux/brcm63xx/patches-3.18/501-board-NB4.patch
	target/linux/brcm63xx/patches-3.18/502-board-96338W2_E7T.patch
	target/linux/brcm63xx/patches-3.18/503-board-CPVA642.patch
	target/linux/brcm63xx/patches-3.18/504-board_dsl_274xb_rev_c.patch
	target/linux/brcm63xx/patches-3.18/505-board_spw500v.patch
	target/linux/brcm63xx/patches-3.18/506-board_gw6200_gw6000.patch
	target/linux/brcm63xx/patches-3.18/507-board-MAGIC.patch
	target/linux/brcm63xx/patches-3.18/508-board_hw553.patch
	target/linux/brcm63xx/patches-3.18/509-board_rta1320_16m.patch
	target/linux/brcm63xx/patches-3.18/510-board_spw303v.patch
	target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch
	target/linux/brcm63xx/patches-3.18/512-board_BTV2110.patch
	target/linux/brcm63xx/patches-3.18/514-board_ct536_ct5621.patch
	target/linux/brcm63xx/patches-3.18/515-board_DWV-S0_fixes.patch
	target/linux/brcm63xx/patches-3.18/516-board_96348A-122.patch
	target/linux/brcm63xx/patches-3.18/517-RTA1205W_16_uart_fixes.patch
	target/linux/brcm63xx/patches-3.18/519_board_CPVA502plus.patch
	target/linux/brcm63xx/patches-3.18/520-bcm63xx-add-support-for-96368MVWG-board.patch
	target/linux/brcm63xx/patches-3.18/521-bcm63xx-add-support-for-96368MVNgr-board.patch
	target/linux/brcm63xx/patches-3.18/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
	target/linux/brcm63xx/patches-3.18/524-board_dsl_274xb_rev_f.patch
	target/linux/brcm63xx/patches-3.18/525-board_96348w3.patch
	target/linux/brcm63xx/patches-3.18/526-board_CT6373-1.patch
	target/linux/brcm63xx/patches-3.18/527-board_dva-g3810bn-tl-1.patch
	target/linux/brcm63xx/patches-3.18/528-board_nb6.patch
	target/linux/brcm63xx/patches-3.18/529-board_fast2604.patch
	target/linux/brcm63xx/patches-3.18/530-board_A4001N1.patch
	target/linux/brcm63xx/patches-3.18/531-board_AR-5387un.patch
	target/linux/brcm63xx/patches-3.18/532-board_AR-5381u.patch
	target/linux/brcm63xx/patches-3.18/533-board_rta770bw.patch
	target/linux/brcm63xx/patches-3.18/534-board_hw556.patch
	target/linux/brcm63xx/patches-3.18/535-board_rta770w.patch
	target/linux/brcm63xx/patches-3.18/536-board_fast2704.patch
	target/linux/brcm63xx/patches-3.18/537-board_fast2504n.patch
	target/linux/brcm63xx/patches-3.18/550-MIPS-BCM63XX-remove-leds-and-buttons.patch
	target/linux/brcm63xx/patches-3.18/570-board_HG655b.patch
	target/linux/cns3xxx/patches-3.18/075-spi_support.patch
	target/linux/generic/config-3.18
	target/linux/generic/files/drivers/net/phy/b53/b53_common.c
	target/linux/generic/patches-3.18/051-02-bridge-allow-setting-hash_max-multicast_router-if-in.patch
	target/linux/generic/patches-3.18/090-overlayfs-fallback-to-readonly-when-full.patch
	target/linux/generic/patches-3.18/259-regmap_dynamic.patch
	target/linux/generic/patches-3.18/302-mips_no_branch_likely.patch
	target/linux/generic/patches-3.18/630-packet_socket_type.patch
	target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch
	target/linux/generic/patches-3.18/653-disable_netlink_trim.patch
	target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch
	target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch
	target/linux/generic/patches-3.18/704-phy-no-genphy-soft-reset.patch
	target/linux/generic/patches-3.18/785-hso-support-0af0-9300.patch
	target/linux/generic/patches-3.18/834-ledtrig-libata.patch
	target/linux/ipq806x/patches-3.18/122-mfd-devicetree-bindings-Add-Qualcomm-RPM-DT-binding.patch
	target/linux/lantiq/dts/VGV7519.dtsi
	target/linux/lantiq/dts/vr9.dtsi
	target/linux/lantiq/patches-3.18/0001-MIPS-lantiq-add-pcie-driver.patch
	target/linux/lantiq/patches-3.18/0030-GPIO-add-named-gpio-exports.patch
	target/linux/lantiq/patches-3.18/0032-USB-fix-roothub-for-IFXHCD.patch
	target/linux/lantiq/patches-3.18/0042-USB-DWC2-big-endian-support.patch
	target/linux/lantiq/patches-3.18/0043-gpio-stp-xway-fix-phy-mask.patch
	target/linux/lantiq/patches-3.18/0151-lantiq-ifxmips_pcie-use-of.patch
	target/linux/mpc85xx/Makefile
	target/linux/mpc85xx/base-files/etc/uci-defaults/02_network
	target/linux/mpc85xx/base-files/lib/mpc85xx.sh
	target/linux/mpc85xx/base-files/lib/preinit/05_set_preinit_iface_mpc85xx
	target/linux/mpc85xx/image/Makefile
	target/linux/mvebu/patches-3.18/010-add_node_alias_to_pinctrl_and_add_base_address.patch
	target/linux/mvebu/patches-3.18/011-use_pinctrl_node_alias.patch
	target/linux/mvebu/patches-3.18/015-move_armada_370_xp_pinctrl_node_definition.patch
	target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch
	target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch
	target/linux/mvebu/patches-3.18/018-normalize_pinctrl_entries_for_armada_socs.patch
	target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch
	target/linux/mvebu/patches-3.18/140-alias_mdio_node.patch
	target/linux/mxs/patches-3.18/101-soc-audio-dts.patch
	target/linux/mxs/patches-3.18/120-dt-add-i2c.patch
	target/linux/oxnas/patches-3.18/800-oxnas-ehci.patch
	target/linux/oxnas/patches-3.18/999-libata-hacks.patch
	target/linux/ramips/base-files/etc/board.d/01_leds
	target/linux/ramips/base-files/etc/board.d/02_network
	target/linux/ramips/base-files/etc/diag.sh
	target/linux/ramips/base-files/lib/ramips.sh
	target/linux/ramips/base-files/lib/upgrade/platform.sh
	target/linux/ramips/dts/DIR-810L.dts
	target/linux/ramips/dts/WHR-300HP2.dts
	target/linux/ramips/files/drivers/net/ethernet/ralink/mt7530.c
	target/linux/ramips/image/Makefile
	target/linux/ramips/mt7621/profiles/firefly.mk
	target/linux/ramips/mt7621/target.mk
	target/linux/ramips/patches-3.18/0030-GPIO-add-named-gpio-exports.patch
	target/linux/ramips/patches-3.18/0062-mt7621-add-ECHI-OCHI-XCHI-support.patch
	target/linux/ramips/patches-3.18/999-disable_illacc.patch
	target/linux/ramips/rt305x/profiles/dlink.mk
	target/linux/x86/64/config-default
	target/linux/x86/xen_domu/target.mk
	toolchain/Config.in
	toolchain/gcc/Config.in
	toolchain/gcc/Config.version
	toolchain/gcc/common.mk
	toolchain/uClibc/config-0.9.33.2/common
	tools/Makefile
	tools/firmware-utils/src/mktplinkfw.c