]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
Manual merge to sync with mainline
authorTony Lindgren <tony@atomide.com>
Tue, 4 Apr 2006 20:30:54 +0000 (13:30 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 4 Apr 2006 20:30:54 +0000 (13:30 -0700)
commit8a6fa30bf75258ab1808ddc445308d71318a0122
treed46a92429a5fa460b24c3f75746d5a647ea682f7
parent8dd2a924d16ef2cb5918409ff61416a19f2a38a6
Manual merge to sync with mainline
17 files changed:
Makefile
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/compressed/Makefile
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-voiceblue.c
drivers/Kconfig
drivers/Makefile
drivers/char/Makefile
drivers/i2c/chips/Makefile
drivers/i2c/chips/tps65010.c
drivers/mmc/mmc.c
drivers/mtd/nand/Kconfig
drivers/net/irda/Makefile
drivers/usb/host/ohci-omap.c
drivers/video/omap/omapfb_main.c
include/asm-arm/arch-omap/omap-alsa.h