merge r17668
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 22 Sep 2009 01:44:36 +0000 (01:44 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 22 Sep 2009 01:44:36 +0000 (01:44 +0000)
commit673e5d6a1f8b78f8fbe4908378ef476e1fde8bc8
treedb51a4bf69616a81d79bba317adb9059ec27a449
parent686fa6227998464912625e5ef1459648007236a1
merge r17668

SVN-Revision: 17669
scripts/combined-image.sh [new file with mode: 0644]
target/linux/atheros/base-files/lib/upgrade/platform.sh [new file with mode: 0644]
target/linux/atheros/image/Makefile