-
Martin Strbacka authored
Conflicts: .gitignore feeds.conf.default files/etc/inittab include/feeds.mk include/image.mk include/kernel-version.mk include/ltqtapi.mk include/netfilter.mk include/scan.mk include/verbose.mk include/version.mk package/Makefile package/base-files/Makefile package/base-files/files/etc/banner package/base-files/files/etc/device_info package/base-files/files/etc/init.d/boot package/base-files/image-config.in package/devel/binutils/Makefile package/devel/valgrind/Makefile package/kernel/brcm2708-gpu-fw/Makefile package/kernel/broadcom-wl/Makefile package/kernel/lantiq/ltq-tapi/Makefile package/kernel/linux/modules/hwmon.mk package/kernel/linux/modules/input.mk package/kernel/linux/modules/lib.mk package/kernel/linux/modules/netfilter.mk package/kernel/linux/modules/other.mk package/kernel/linux/modules/usb.mk package/kernel/linux/modules/video.mk package/kernel/linux/modules/wireless.mk package/kernel/mac80211/Makefile package...
fd7846cd