Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 4 Apr 2006 15:30:26 +0000 (08:30 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 4 Apr 2006 15:30:26 +0000 (08:30 -0700)
commit8dd2a924d16ef2cb5918409ff61416a19f2a38a6
tree5d6bcfe1e1a00141bc38e7c7fc31ec6a2ac16d9b
parent8c6cfface78a77ed68788216d5fecdac7d8d09c3
parent6246b6128bbe34d0752f119cf7c5111c85fe481d
Merge with /home/tmlind/src/kernel/linux-2.6
29 files changed:
arch/arm/boot/compressed/head.S
drivers/char/Kconfig
drivers/char/watchdog/Kconfig
drivers/char/watchdog/Makefile
drivers/i2c/busses/Kconfig
drivers/i2c/chips/Kconfig
drivers/i2c/chips/isp1301_omap.c
drivers/input/keyboard/Kconfig
drivers/input/touchscreen/ads7846.c
drivers/media/video/Kconfig
drivers/media/video/Makefile
drivers/mmc/mmc.c
drivers/net/irda/Kconfig
drivers/net/smc91x.c
drivers/net/smc91x.h
drivers/pcmcia/omap_cf.c
drivers/serial/8250.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/omap_udc.c
drivers/video/Kconfig
drivers/video/Makefile
include/asm-arm/dma-mapping.h
include/linux/fb.h
include/linux/i2c-id.h
include/linux/input.h
init/do_mounts.c
kernel/printk.c
net/ipv4/netfilter/Kconfig
net/ipv4/netfilter/Makefile