[backfire] merges r21117
authorralph <ralph@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 24 Apr 2010 06:18:01 +0000 (06:18 +0000)
committerralph <ralph@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 24 Apr 2010 06:18:01 +0000 (06:18 +0000)
commit2634f8c4fb78bb26fb82936a994662250460b3f1
treeb05c0be7d0d252b55e6e79deb33c1d8332f6cdaf
parent26fa8027082cd75543a7647635850fe315b1ecff
[backfire] merges r21117

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21118 3c298f89-4303-0410-b956-a3cf2f4a3e73
package/uboot-lantiq/files/include/configs/ifx-common.h
package/uboot-lantiq/patches/300-httpd.patch