This week only. Pastebin PRO Accounts Christmas Special! Don't miss out!Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on Nov 2nd, 2010  |  syntax: None  |  size: 7.01 KB  |  views: 55  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. # On branch local_backfire
  2. # Your branch and 'origin/master' have diverged,
  3. # and have 604 and 67 different commit(s) each, respectively.
  4. #
  5. # Changes to be committed:
  6. #
  7. #       new file:   data/qi_lb60/conf/feeds.conf
  8. #       modified:   include/package-defaults.mk
  9. #       modified:   include/package-ipkg.mk
  10. #       modified:   include/target.mk
  11. #       modified:   package/6in4/Makefile
  12. #       modified:   package/6in4/files/6in4.hotplug
  13. #       modified:   package/6in4/files/6in4.sh
  14. #       modified:   package/base-files/Makefile
  15. #       modified:   package/broadcom-diag/Makefile
  16. #       modified:   package/broadcom-diag/src/diag.c
  17. #       deleted:    package/broadcom-sdhc/Makefile
  18. #       modified:   package/firewall/Makefile
  19. #       new file:   package/firewall/files/reflection.hotplug
  20. #       modified:   package/firewall/files/uci_firewall.sh
  21. #       modified:   package/grub/Makefile
  22. #       new file:   package/hostapd/patches/420-stbc_fix_backport.patch
  23. #       modified:   package/ifx-vmmc/Makefile
  24. #       modified:   package/kernel/modules/usb.mk
  25. #       new file:   package/mac80211/patches/560-ath9k_baw_fix.patch
  26. #       new file:   package/mac80211/patches/570-ath9k_mic_failure_fix.patch
  27. #       new file:   package/mac80211/patches/580-ath9k_aggr_start_fix.patch
  28. #       modified:   package/opkg/Makefile
  29. #       modified:   package/opkg/patches/011-old-config-location.patch
  30. #       new file:   package/opkg/patches/014-force-postinstall.patch
  31. #       new file:   package/opkg/patches/015-add-arch-dest.patch
  32. #       modified:   package/ppp/Makefile
  33. #       new file:   package/ppp/patches/340-populate_default_gateway.patch
  34. #       modified:   package/uhttpd/Makefile
  35. #       modified:   package/uhttpd/files/uhttpd.config
  36. #       modified:   package/uhttpd/files/uhttpd.init
  37. #       modified:   package/uhttpd/src/uhttpd-cgi.c
  38. #       modified:   package/uhttpd/src/uhttpd-cgi.h
  39. #       modified:   package/uhttpd/src/uhttpd-file.c
  40. #       modified:   package/uhttpd/src/uhttpd-tls.c
  41. #       modified:   package/uhttpd/src/uhttpd-utils.c
  42. #       modified:   package/uhttpd/src/uhttpd-utils.h
  43. #       modified:   package/uhttpd/src/uhttpd.c
  44. #       modified:   package/uhttpd/src/uhttpd.h
  45. #       modified:   package/util-linux-ng/Makefile
  46. #       modified:   rules.mk
  47. #       modified:   scripts/metadata.pl
  48. #       modified:   target/imagebuilder/Makefile
  49. #       modified:   target/imagebuilder/files/Makefile
  50. #       new file:   target/imagebuilder/files/repositories.conf
  51. #       modified:   target/linux/adm5120/router_be/target.mk
  52. #       modified:   target/linux/adm5120/router_le/target.mk
  53. #       modified:   target/linux/ar7/Makefile
  54. #       new file:   target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
  55. #       new file:   target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch
  56. #       new file:   target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch
  57. #       modified:   target/linux/ar71xx/base-files/etc/defconfig/tl-wr741nd/network
  58. #       new file:   target/linux/ar71xx/base-files/etc/uci-defaults/vlan-migration
  59. #       modified:   target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
  60. #       modified:   target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
  61. #       modified:   target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h
  62. #       modified:   target/linux/ar71xx/files/drivers/net/ag71xx/Makefile
  63. #       modified:   target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
  64. #       new file:   target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
  65. #       modified:   target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar8216.c
  66. #       modified:   target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
  67. #       modified:   target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
  68. #       modified:   target/linux/atheros/config-2.6.30
  69. #       modified:   target/linux/atheros/config-2.6.32
  70. #       modified:   target/linux/brcm-2.4/image/Makefile
  71. #       new file:   target/linux/brcm-2.4/profiles/WRT610Nv1.mk
  72. #       modified:   target/linux/brcm63xx/config-2.6.32
  73. #       modified:   target/linux/generic-2.6/config-2.6.30
  74. #       modified:   target/linux/generic-2.6/config-2.6.32
  75. #       modified:   target/linux/generic-2.6/files/drivers/net/phy/ar8216.c
  76. #       deleted:    target/linux/generic-2.6/files/drivers/net/phy/ip175c.c
  77. #       new file:   target/linux/generic-2.6/files/drivers/net/phy/ip17xx.c
  78. #       modified:   target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c
  79. #       modified:   target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.c
  80. #       modified:   target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.h
  81. #       modified:   target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c
  82. #       modified:   target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
  83. #       modified:   target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
  84. #       modified:   target/linux/generic-2.6/files/include/linux/switch.h
  85. #       new file:   target/linux/generic-2.6/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch
  86. #       deleted:    target/linux/generic-2.6/patches-2.6.30/014-samsung_flash
  87. #       new file:   target/linux/generic-2.6/patches-2.6.30/089-mtd-samsung-flash.patch
  88. #       modified:   target/linux/generic-2.6/patches-2.6.30/670-phy_ip175c.patch
  89. #       modified:   target/linux/generic-2.6/patches-2.6.30/680-phy_ar8216.patch
  90. #       modified:   target/linux/generic-2.6/patches-2.6.30/690-phy_rtl8306.patch
  91. #       modified:   target/linux/generic-2.6/patches-2.6.30/691-phy_rtl8366.patch
  92. #       new file:   target/linux/generic-2.6/patches-2.6.32/014-cfi_fix_amd_extended_table_check.patch
  93. #       deleted:    target/linux/generic-2.6/patches-2.6.32/014-samsung_flash
  94. #       new file:   target/linux/generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch
  95. #       deleted:    target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch
  96. #       modified:   target/linux/generic-2.6/patches-2.6.32/670-phy_ip175c.patch
  97. #       modified:   target/linux/generic-2.6/patches-2.6.32/680-phy_ar8216.patch
  98. #       modified:   target/linux/generic-2.6/patches-2.6.32/690-phy_rtl8306.patch
  99. #       modified:   target/linux/generic-2.6/patches-2.6.32/691-phy_rtl8366.patch
  100. #       modified:   target/linux/ifxmips/extract.sh
  101. #       modified:   target/linux/ifxmips/patches-2.6.30/310-cfi0002-swap.patch
  102. #       modified:   target/linux/octeon/config-2.6.30
  103. #       deleted:    target/linux/orion/patches/050-wrt350nv2_cfi_workaround.patch
  104. #       new file:   target/linux/rdc/patches-2.6.30/015-r6040_fix_multicast.patch
  105. #       modified:   tools/Makefile
  106. #       modified:   tools/qemu/Makefile
  107. #
  108. # Unmerged paths:
  109. #   (use "git add/rm <file>..." as appropriate to mark resolution)
  110. #
  111. #       both added:         data/qi_lb60/conf/config.full_system
  112. #       both added:         data/qi_lb60/scripts/build
  113. #       both modified:      target/linux/x86/image/Config.in
  114. #
  115. # Untracked files:
  116. #   (use "git add <file>..." to include in what will be committed)
  117. #
  118. #       error
  119. #       status
clone this paste RAW Paste Data