Date: | 2010-05-12 19:47:13 (13 years 10 months ago) |
---|---|
Author: | Mirko Vogt |
Commit: | e65b1bfafb324e5f07b8ece6a1497e0b3d108147 |
Message: | Merge commit 'openwrt-backfire/master' into xburst Conflicts: package/mac80211/patches/120-compat_rcu_dereference.patch package/mac80211/patches/130-tracepoint_include_linux_version_h.patch target/linux/x86/Makefile diff --cc target/Config.in index d522b79,48fd827..7d21427 --- a/target/Config.in +++ b/target/Config.in @@@ -49,12 -49,9 +49,12 @@@ config USES_JFFS config USES_EXT2 bool - config USES_TGZ + config USES_TARGZ bool +config USES_UBIFS + bool + config USES_CPIOGZ bool |