Conflicts:
	.gitignore
	README.md
	package/kernel/linux/modules/netdevices.mk
	package/kernel/linux/modules/netfilter.mk
	package/kernel/linux/modules/sound.mk
	package/kernel/linux/modules/usb.mk
	scripts/feeds
	toolchain/binutils/Config.in
	toolchain/binutils/Config.version
	tools/Makefile