Lars-Peter Clausen 78fcab66df Merge commit 'backfire/master' into xburst ... Conflicts: feeds.conf.default package/base-files/Makefile package/block-extroot/Makefile package/block-mount/Makefile package/busybox/Makefile package/busybox/config/util-linux/Config.in package/dnsmasq/Makefile package/dnsmasq/files/dnsmasq.init package/uhttpd/Makefile target/linux/adm5120/image/Makefile target/linux/amazon/image/Makefile target/linux/ar71xx/config-2.6.33 target/linux/ar71xx/config-2.6.34 target/linux/at91/image/Makefile target/linux/atheros/patches-2.6.33/220-enet_micrel_workaround.patch target/linux/coldfire/image/Makefile target/linux/ep93xx/image/Makefile target/linux/etrax/image/Makefile target/linux/gemini/image/Makefile target/linux/generic-2.6/config-2.6.33 target/linux/generic-2.6/config-2.6.34 target/linux/generic-2.6/patches-2.6.33/007-squashfs_make_lzma_available.patch target/linux/generic-2.6/patches-2.6.33/014-samsung_flash target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch target/linux/generic-2.6/patches-2.6.33/030-pci_disable_common_quirks.patch target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch target/linux/generic-2.6/patches-2.6.33/100-netfilter_layer7_2.21.patch target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch target/linux/generic-2.6/patches-2.6.33/202-mips_mem_functions_performance.patch target/linux/generic-2.6/patches-2.6.33/203-slab_maxsize.patch target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch target/linux/generic-2.6/patches-2.6.33/210-mini_fo_2.6.25_fixes.patch target/linux/generic-2.6/patches-2.6.33/212-mini_fo_2.6.26_fixes.patch target/linux/generic-2.6/patches-2.6.33/400-ledtrig_morse.patch target/linux/generic-2.6/patches-2.6.33/402-ledtrig_netdev.patch target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch target/linux/generic-2.6/patches-2.6.33/903-hostap_txpower.patch target/linux/generic-2.6/patches-2.6.33/924-cs5535_gpio.patch target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch target/linux/generic-2.6/patches-2.6.33/971-ocf_20080917.patch target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch target/linux/generic-2.6/patches-2.6.33/998-openwrt_lzma_options.patch target/linux/goldfish/image/Makefile target/linux/iop32x/image/Makefile target/linux/malta/Makefile target/linux/malta/README target/linux/malta/image/Makefile target/linux/mpc52xx/image/Makefile target/linux/mpc83xx/image/Makefile target/linux/omap35xx/image/Makefile target/linux/ppc40x/config-default target/linux/ppc40x/patches/004-magicbox.patch target/linux/ppc40x/patches/005-openrb.patch target/linux/ps3/image/Makefile target/linux/pxa/image/Makefile target/linux/pxcab/image/Makefile target/linux/ramips/image/Makefile target/linux/ramips/rt288x/config-2.6.32 target/linux/ramips/rt305x/config-2.6.32 target/linux/s3c24xx/image/Makefile target/linux/sibyte/image/Makefile target/linux/ubicom32/image/Makefile target/linux/x86/generic/config-default		2010-05-02 13:23:58 +02:00
..
be	[malta] fix module loading due to CONFIG_LOCALVERSION being on (#7144)	2010-04-12 12:33:41 +00:00
le	[malta] fix module loading due to CONFIG_LOCALVERSION being on (#7144)	2010-04-12 12:33:41 +00:00