Merge branch 'del-2.6.28' into hpalacio/2.6.35_merged

Conflicts:
	Documentation/filesystems/squashfs.txt
	arch/arm/Kconfig
	arch/arm/configs/ns9xxx_defconfig
	arch/arm/include/asm/elf.h
	arch/arm/kernel/module.c
	arch/arm/mach-ns9xxx/include/mach/system.h
	arch/arm/mach-ns9xxx/include/mach/uncompress.h
	arch/arm/mach-ns9xxx/irq.c
	arch/arm/mach-ns9xxx/plat-serial8250.c
	arch/arm/mach-s3c2410/include/mach/gpio.h
	arch/arm/mach-s3c2410/include/mach/map.h
	arch/arm/mach-s3c2410/include/mach/regs-gpio.h
	arch/arm/mach-s3c2410/include/mach/regs-gpioj.h
	arch/arm/mach-s3c2410/include/mach/usb-control.h
	arch/arm/plat-s3c/Kconfig
	arch/arm/plat-s3c/include/plat/regs-adc.h
	arch/arm/plat-s3c/include/plat/regs-serial.h
	arch/arm/plat-s3c/include/plat/uncompress.h
	arch/arm/plat-s3c24xx/Kconfig
	arch/arm/plat-s3c24xx/Makefile
	arch/arm/plat-s3c24xx/cpu.c
	arch/arm/plat-s3c24xx/devs.c
	arch/arm/plat-s3c24xx/dma.c
	arch/arm/plat-s3c24xx/include/plat/udc.h
	arch/arm/plat-s3c24xx/pm.c
	arch/arm/plat-s3c24xx/pwm-clock.c
	arch/arm/plat-s3c24xx/time.c
	arch/arm/tools/mach-types
	crypto/api.c
	drivers/Makefile
	drivers/base/sys.c
	drivers/char/Kconfig
	drivers/char/keyboard.c
	drivers/char/mem.c
	drivers/char/random.c
	drivers/crypto/Makefile
	drivers/gpio/gpiolib.c
	drivers/i2c/busses/Kconfig
	drivers/i2c/busses/i2c-s3c2410.c
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/input/touchscreen/ads7846.c
	drivers/leds/Kconfig
	drivers/leds/Makefile
	drivers/leds/leds-pwm.c
	drivers/mmc/core/mmc.c
	drivers/mmc/host/Kconfig
	drivers/mmc/host/s3cmci.c
	drivers/mtd/chips/cfi_probe.c
	drivers/mtd/nand/Makefile
	drivers/mtd/nand/s3c2410.c
	drivers/net/Kconfig
	drivers/net/Makefile
	drivers/net/can/Kconfig
	drivers/net/can/Makefile
	drivers/net/can/dev.c
	drivers/net/can/mcp251x.c
	drivers/net/can/mscan/Makefile
	drivers/net/can/mscan/mscan.c
	drivers/net/can/mscan/mscan.h
	drivers/net/can/sja1000/Makefile
	drivers/net/can/sja1000/ems_pci.c
	drivers/net/can/sja1000/kvaser_pci.c
	drivers/net/can/sja1000/sja1000.c
	drivers/net/can/sja1000/sja1000.h
	drivers/net/can/sja1000/sja1000_platform.c
	drivers/net/can/vcan.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/rtc/Kconfig
	drivers/rtc/Makefile
	drivers/scsi/Kconfig
	drivers/serial/Kconfig
	drivers/serial/Makefile
	drivers/serial/samsung.c
	drivers/serial/serial_core.c
	drivers/spi/Kconfig
	drivers/spi/Makefile
	drivers/usb/gadget/Kconfig
	drivers/usb/gadget/gadget_chips.h
	drivers/video/Makefile
	drivers/watchdog/Kconfig
	drivers/watchdog/Makefile
	fs/Kconfig
	fs/squashfs/Kconfig
	fs/squashfs/Makefile
	fs/squashfs/block.c
	fs/squashfs/cache.c
	fs/squashfs/dir.c
	fs/squashfs/export.c
	fs/squashfs/file.c
	fs/squashfs/fragment.c
	fs/squashfs/id.c
	fs/squashfs/inode.c
	fs/squashfs/namei.c
	fs/squashfs/squashfs.h
	fs/squashfs/squashfs_fs.h
	fs/squashfs/squashfs_fs_i.h
	fs/squashfs/squashfs_fs_sb.h
	fs/squashfs/super.c
	fs/squashfs/symlink.c
	include/asm-arm/plat-s3c24xx/mci.h
	include/linux/can/dev.h
	include/linux/can/platform/mcp251x.h
	include/linux/can/platform/sja1000.h
	include/linux/ieee80211.h
	include/linux/magic.h
	include/linux/miscdevice.h
	include/linux/mmc/host.h
	include/linux/mtd/cfi.h
	include/linux/nl80211.h
	include/linux/random.h
	include/linux/skbuff.h
	include/linux/spi/ads7846.h
	include/net/cfg80211.h
	include/net/ieee80211.h
	include/net/mac80211.h
	include/net/wireless.h
	include/sound/soc.h
	init/do_mounts_rd.c
	init/initramfs.c
	init/main.c
	lib/kobject.c
	net/core/skbuff.c
	net/ieee80211/Kconfig
	net/ieee80211/Makefile
	net/ieee80211/ieee80211_tx.c
	net/ieee80211/ieee80211_wx.c
	net/mac80211/Kconfig
	net/mac80211/cfg.c
	net/mac80211/debugfs.c
	net/mac80211/debugfs_netdev.c
	net/mac80211/debugfs_sta.c
	net/mac80211/event.c
	net/mac80211/ht.c
	net/mac80211/ieee80211_i.h
	net/mac80211/iface.c
	net/mac80211/key.c
	net/mac80211/main.c
	net/mac80211/mesh.c
	net/mac80211/mesh_plink.c
	net/mac80211/mlme.c
	net/mac80211/rate.c
	net/mac80211/rate.h
	net/mac80211/rc80211_minstrel.c
	net/mac80211/rc80211_pid_algo.c
	net/mac80211/rx.c
	net/mac80211/scan.c
	net/mac80211/sta_info.c
	net/mac80211/sta_info.h
	net/mac80211/tx.c
	net/mac80211/util.c
	net/mac80211/wep.c
	net/mac80211/wep.h
	net/mac80211/wext.c
	net/mac80211/wme.c
	net/mac80211/wpa.c
	net/wireless/Kconfig
	net/wireless/Makefile
	net/wireless/core.c
	net/wireless/core.h
	net/wireless/lib80211_crypt_ccmp.c
	net/wireless/lib80211_crypt_tkip.c
	net/wireless/nl80211.c
	net/wireless/reg.c
	net/wireless/reg.h
	net/wireless/sysfs.c
	net/wireless/util.c
	net/wireless/wext-compat.c
	net/wireless/wext.c
	scripts/kallsyms.c
	scripts/mod/modpost.c
	scripts/setlocalversion
	scripts/unifdef.c
	sound/soc/codecs/wm8753.c
	sound/soc/s3c24xx/Kconfig
	sound/soc/s3c24xx/Makefile
	sound/soc/s3c24xx/s3c2412-i2s.c
	sound/soc/s3c24xx/s3c24xx-pcm.c
	sound/soc/soc-core.c

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index a2b902f4d437..08fb72c17a89 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -108,6 +108,8 @@ source "drivers/vlynq/Kconfig"
 
 source "drivers/xen/Kconfig"
 
+source "drivers/fims/Kconfig"
+
 source "drivers/staging/Kconfig"
 
 source "drivers/platform/Kconfig"