# On branch local_backfire # Your branch and 'origin/master' have diverged, # and have 604 and 67 different commit(s) each, respectively. # # Changes to be committed: # # new file: data/qi_lb60/conf/feeds.conf # modified: include/package-defaults.mk # modified: include/package-ipkg.mk # modified: include/target.mk # modified: package/6in4/Makefile # modified: package/6in4/files/6in4.hotplug # modified: package/6in4/files/6in4.sh # modified: package/base-files/Makefile # modified: package/broadcom-diag/Makefile # modified: package/broadcom-diag/src/diag.c # deleted: package/broadcom-sdhc/Makefile # modified: package/firewall/Makefile # new file: package/firewall/files/reflection.hotplug # modified: package/firewall/files/uci_firewall.sh # modified: package/grub/Makefile # new file: package/hostapd/patches/420-stbc_fix_backport.patch # modified: package/ifx-vmmc/Makefile # modified: package/kernel/modules/usb.mk # new file: package/mac80211/patches/560-ath9k_baw_fix.patch # new file: package/mac80211/patches/570-ath9k_mic_failure_fix.patch # new file: package/mac80211/patches/580-ath9k_aggr_start_fix.patch # modified: package/opkg/Makefile # modified: package/opkg/patches/011-old-config-location.patch # new file: package/opkg/patches/014-force-postinstall.patch # new file: package/opkg/patches/015-add-arch-dest.patch # modified: package/ppp/Makefile # new file: package/ppp/patches/340-populate_default_gateway.patch # modified: package/uhttpd/Makefile # modified: package/uhttpd/files/uhttpd.config # modified: package/uhttpd/files/uhttpd.init # modified: package/uhttpd/src/uhttpd-cgi.c # modified: package/uhttpd/src/uhttpd-cgi.h # modified: package/uhttpd/src/uhttpd-file.c # modified: package/uhttpd/src/uhttpd-tls.c # modified: package/uhttpd/src/uhttpd-utils.c # modified: package/uhttpd/src/uhttpd-utils.h # modified: package/uhttpd/src/uhttpd.c # modified: package/uhttpd/src/uhttpd.h # modified: package/util-linux-ng/Makefile # modified: rules.mk # modified: scripts/metadata.pl # modified: target/imagebuilder/Makefile # modified: target/imagebuilder/files/Makefile # new file: target/imagebuilder/files/repositories.conf # modified: target/linux/adm5120/router_be/target.mk # modified: target/linux/adm5120/router_le/target.mk # modified: target/linux/ar7/Makefile # new file: target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch # new file: target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch # new file: target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch # modified: target/linux/ar71xx/base-files/etc/defconfig/tl-wr741nd/network # new file: target/linux/ar71xx/base-files/etc/uci-defaults/vlan-migration # modified: target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig # modified: target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c # modified: target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h # modified: target/linux/ar71xx/files/drivers/net/ag71xx/Makefile # modified: target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h # new file: target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c # modified: target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar8216.c # modified: target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c # modified: target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c # modified: target/linux/atheros/config-2.6.30 # modified: target/linux/atheros/config-2.6.32 # modified: target/linux/brcm-2.4/image/Makefile # new file: target/linux/brcm-2.4/profiles/WRT610Nv1.mk # modified: target/linux/brcm63xx/config-2.6.32 # modified: target/linux/generic-2.6/config-2.6.30 # modified: target/linux/generic-2.6/config-2.6.32 # modified: target/linux/generic-2.6/files/drivers/net/phy/ar8216.c # deleted: target/linux/generic-2.6/files/drivers/net/phy/ip175c.c # new file: target/linux/generic-2.6/files/drivers/net/phy/ip17xx.c # modified: target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c # modified: target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.c # modified: target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.h # modified: target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c # modified: target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c # modified: target/linux/generic-2.6/files/drivers/net/phy/swconfig.c # modified: target/linux/generic-2.6/files/include/linux/switch.h # new file: target/linux/generic-2.6/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch # deleted: target/linux/generic-2.6/patches-2.6.30/014-samsung_flash # new file: target/linux/generic-2.6/patches-2.6.30/089-mtd-samsung-flash.patch # modified: target/linux/generic-2.6/patches-2.6.30/670-phy_ip175c.patch # modified: target/linux/generic-2.6/patches-2.6.30/680-phy_ar8216.patch # modified: target/linux/generic-2.6/patches-2.6.30/690-phy_rtl8306.patch # modified: target/linux/generic-2.6/patches-2.6.30/691-phy_rtl8366.patch # new file: target/linux/generic-2.6/patches-2.6.32/014-cfi_fix_amd_extended_table_check.patch # deleted: target/linux/generic-2.6/patches-2.6.32/014-samsung_flash # new file: target/linux/generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch # deleted: target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch # modified: target/linux/generic-2.6/patches-2.6.32/670-phy_ip175c.patch # modified: target/linux/generic-2.6/patches-2.6.32/680-phy_ar8216.patch # modified: target/linux/generic-2.6/patches-2.6.32/690-phy_rtl8306.patch # modified: target/linux/generic-2.6/patches-2.6.32/691-phy_rtl8366.patch # modified: target/linux/ifxmips/extract.sh # modified: target/linux/ifxmips/patches-2.6.30/310-cfi0002-swap.patch # modified: target/linux/octeon/config-2.6.30 # deleted: target/linux/orion/patches/050-wrt350nv2_cfi_workaround.patch # new file: target/linux/rdc/patches-2.6.30/015-r6040_fix_multicast.patch # modified: tools/Makefile # modified: tools/qemu/Makefile # # Unmerged paths: # (use "git add/rm ..." as appropriate to mark resolution) # # both added: data/qi_lb60/conf/config.full_system # both added: data/qi_lb60/scripts/build # both modified: target/linux/x86/image/Config.in # # Untracked files: # (use "git add ..." to include in what will be committed) # # error # status