[backfire] merge r23256, r23257 and r23258
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 7 Oct 2010 15:06:15 +0000 (15:06 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 7 Oct 2010 15:06:15 +0000 (15:06 +0000)
commit28caf5dec8dee4fe358d0982f5fea2a6ebe200db
tree60afe092cfbbf38e169efccae8842a2e2de86047
parent8f907fd5992346ac37fe000e602bfc57b728b273
[backfire] merge r23256, r23257 and r23258

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23295 3c298f89-4303-0410-b956-a3cf2f4a3e73
include/package-ipkg.mk
package/base-files/Makefile
package/base-files/files/etc/sysupgrade.conf [new file with mode: 0644]
package/base-files/files/lib/upgrade/keep.d/base-files-essential [new file with mode: 0644]
package/base-files/files/sbin/sysupgrade
tools/ipkg-utils/patches/170-resolve_conffiles.patch [new file with mode: 0644]