www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - arch/arm/mach-omap2/board-omap2evm.c

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

arch/arm/Makefile
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/clock24xx.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/memory.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/sleep.S
arch/arm/plat-omap/devices.c
drivers/i2c/chips/menelaus.c
drivers/input/keyboard/omap-keypad.c
drivers/watchdog/omap_wdt.c
include/asm-arm/arch-omap/board-2430sdp.h
include/asm-arm/arch-omap/board-apollon.h
include/asm-arm/arch-omap/board-h4.h
include/asm-arm/arch-omap/board-nokia.h
include/asm-arm/arch-omap/board.h
include/asm-arm/arch-omap/clock.h
include/asm-arm/arch-omap/common.h
include/asm-arm/arch-omap/control.h
include/asm-arm/arch-omap/cpu.h
include/asm-arm/arch-omap/debug-macro.S
include/asm-arm/arch-omap/dsp_common.h
include/asm-arm/arch-omap/entry-macro.S
include/asm-arm/arch-omap/gpio-switch.h
include/asm-arm/arch-omap/gpio.h
include/asm-arm/arch-omap/gpmc.h
include/asm-arm/arch-omap/hardware.h
include/asm-arm/arch-omap/io.h
include/asm-arm/arch-omap/irqs.h
include/asm-arm/arch-omap/mailbox.h
include/asm-arm/arch-omap/mcbsp.h
include/asm-arm/arch-omap/memory.h
include/asm-arm/arch-omap/mmc.h
include/asm-arm/arch-omap/mux.h
include/asm-arm/arch-omap/omap-alsa.h
include/asm-arm/arch-omap/omap1510.h
include/asm-arm/arch-omap/omap16xx.h
include/asm-arm/arch-omap/omap24xx.h
include/asm-arm/arch-omap/omap34xx.h
include/asm-arm/arch-omap/omapfb.h
include/asm-arm/arch-omap/onenand.h
include/asm-arm/arch-omap/pm.h
include/asm-arm/arch-omap/prcm.h
include/asm-arm/arch-omap/sdrc.h
include/asm-arm/arch-omap/serial.h
include/asm-arm/arch-omap/sram.h
include/asm-arm/arch-omap/system.h
include/asm-arm/arch-omap/timex.h
include/asm-arm/arch-omap/usb.h
include/asm-arm/arch-omap/vmalloc.h

author	Tony Lindgren <tony@atomide.com>
	Thu, 14 Aug 2008 09:57:16 +0000 (12:57 +0300)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 14 Aug 2008 09:57:16 +0000 (12:57 +0300)
commit	fdee8764947cde1e6933e7d981ce5b9de00e83e6
tree	f289ca71f54a3f720b35df1152bc8c4d25e69556	tree \| snapshot
parent	5e98022428bf97c435adaaaf3975eeb19040f8eb	commit \| diff
parent	30a2f3c60a84092c8084dfe788b710f8d0768cd4	commit \| diff

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/head.S	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-h2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-h3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-nokia770.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-palmte.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-sx1.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-voiceblue.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/mcbsp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/mmu.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap1/mmu.h	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/bci.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-2430sdp-flash.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-2430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-3430sdp-flash.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-3430sdp.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-apollon-keys.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-apollon-mmc.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-apollon.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-h4-mmc.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-h4.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-ldp.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-n800-audio.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-n800-bt.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-n800-camera.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-n800-dsp.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-n800-flash.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-n800-mmc.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-n800-usb.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-n800.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-n810.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-omap2evm.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-omap3beagle.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-omap3evm-flash.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clock.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clock24xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clock34xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clock34xx.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clockdomain.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/clockdomains.h	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/gpmc.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/hsmmc.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/id.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/io.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/irq.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/mailbox.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/mcbsp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/mmu.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/mmu.h	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/mux.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pm-debug.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/pm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pm24xx.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/pm34xx.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/powerdomain.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/powerdomains.h	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/powerdomains24xx.h	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/powerdomains34xx.h	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/sdrc.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/sdrc2xxx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/serial.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/sleep242x.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/sleep243x.S	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/sleep34xx.S	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/smartreflex.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/sram242x.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/sram243x.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/sram34xx.S	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/timer-gp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/usb-ehci.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/usb-musb.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/usb-tusb6010.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/bootreason.c	diff1 \|	\|	blob \| history
arch/arm/plat-omap/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/component-version.c	diff1 \|	\|	blob \| history
arch/arm/plat-omap/cpu-omap.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/dmtimer.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/gpio-switch.c	diff1 \|	\|	blob \| history
arch/arm/plat-omap/i2c.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/aic23.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/bci.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/board-2430sdp.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/board-3430sdp.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/board-apollon.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/board-h4.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/board-ldp.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/board-nokia.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/board-omap2evm.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/board-omap3beagle.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/board-omap3evm.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/board.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/clock.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/clockdomain.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/control.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/cpu.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/debug-macro.S	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/dsp.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/dsp_common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/entry-macro.S	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/gpio-switch.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/gpio.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/gpmc.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/hardware.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/hdrc_cnf.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/hsmmc.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/io.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/irqs.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/mailbox.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/mcbsp.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/memory.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/mmc.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/mmu.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/mux.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/omap-alsa.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/omap1510.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/omap16xx.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/omap24xx.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/omap34xx.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/omapfb.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/onenand.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/pm.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/powerdomain.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/prcm.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/sdrc.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/serial.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/sram.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/sti.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/system.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/timex.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/usb-ehci.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/usb-musb.h	diff1 \|	\|	blob \| history
arch/arm/plat-omap/include/mach/usb.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/vmalloc.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/mcbsp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/mmu.c	diff1 \|	\|	blob \| history
arch/arm/plat-omap/sram.c	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/brf6150.c	diff1 \|	\|	blob \| history
drivers/bluetooth/brf6150.h	diff1 \|	\|	blob \| history
drivers/cbus/cbus.c	diff1 \|	\|	blob \| history
drivers/cbus/retu.c	diff1 \|	\|	blob \| history
drivers/cbus/tahvo-usb.c	diff1 \|	\|	blob \| history
drivers/cbus/tahvo.c	diff1 \|	\|	blob \| history
drivers/dsp/dspgateway/dsp.h	diff1 \|	\|	blob \| history
drivers/dsp/dspgateway/dsp_common.c	diff1 \|	\|	blob \| history
drivers/dsp/dspgateway/dsp_core.c	diff1 \|	\|	blob \| history
drivers/dsp/dspgateway/dsp_ctl.c	diff1 \|	\|	blob \| history
drivers/dsp/dspgateway/dsp_mem.c	diff1 \|	\|	blob \| history
drivers/dsp/dspgateway/error.c	diff1 \|	\|	blob \| history
drivers/dsp/dspgateway/ipbuf.c	diff1 \|	\|	blob \| history
drivers/dsp/dspgateway/mblog.c	diff1 \|	\|	blob \| history
drivers/dsp/dspgateway/omap2_dsp.h	diff1 \|	\|	blob \| history
drivers/dsp/dspgateway/task.c	diff1 \|	\|	blob \| history
drivers/dsp/dspgateway/taskwatch.c	diff1 \|	\|	blob \| history
drivers/dsp/dspgateway/uaccess_dsp.h	diff1 \|	\|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/omap34xx_temp.c	diff1 \|	\|	blob \| history
drivers/i2c/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/isp1301_omap.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/lp5521.c	diff1 \|	\|	blob \| history
drivers/i2c/chips/menelaus.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/tlv320aic23.c	diff1 \|	\|	blob \| history
drivers/i2c/chips/tsl2563.c	diff1 \|	\|	blob \| history
drivers/i2c/chips/twl4030-core.c	diff1 \|	\|	blob \| history
drivers/i2c/chips/twl4030-gpio.c	diff1 \|	\|	blob \| history
drivers/i2c/chips/twl4030-usb.c	diff1 \|	\|	blob \| history
drivers/input/keyboard/omap-keypad.c	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/omap-twl4030keypad.c	diff1 \|	\|	blob \| history
drivers/input/touchscreen/tsc2005.c	diff1 \|	\|	blob \| history
drivers/leds/leds-omap-pwm.c	diff1 \|	\|	blob \| history
drivers/leds/leds-omap.c	diff1 \|	\|	blob \| history
drivers/media/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/video/omap/omap16xxcam.c	diff1 \|	\|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/sti/sdti.c	diff1 \|	\|	blob \| history
drivers/misc/sti/sti-console.c	diff1 \|	\|	blob \| history
drivers/misc/sti/sti-fifo.c	diff1 \|	\|	blob \| history
drivers/misc/sti/sti-netlink.c	diff1 \|	\|	blob \| history
drivers/misc/sti/sti.c	diff1 \|	\|	blob \| history
drivers/mmc/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	diff1 \|	\|	blob \| history
drivers/mtd/maps/omap-toto-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/omap_nor.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/omap-hw.c	diff1 \|	\|	blob \| history
drivers/mtd/nand/omap-nand-flash.c	diff1 \|	\|	blob \| history
drivers/mtd/nand/omap2.c	diff1 \|	\|	blob \| history
drivers/mtd/onenand/omap2.c	diff1 \|	\|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/omap-ir.c	diff1 \|	\|	blob \| history
drivers/net/smc911x.h	diff1 \|	diff2 \|	blob \| history
drivers/rtc/rtc-twl4030.c	diff1 \|	\|	blob \| history
drivers/spi/tsc2301-core.c	diff1 \|	\|	blob \| history
drivers/usb/gadget/omap_udc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-omap.c	diff1 \|	\|	blob \| history
drivers/usb/host/ehci-omap.h	diff1 \|	\|	blob \| history
drivers/usb/host/ohci-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/davinci.c	diff1 \|	\|	blob \| history
drivers/usb/musb/musb_core.c	diff1 \|	\|	blob \| history
drivers/usb/musb/musb_core.h	diff1 \|	\|	blob \| history
drivers/usb/musb/musb_procfs.c	diff1 \|	\|	blob \| history
drivers/usb/musb/omap2430.c	diff1 \|	\|	blob \| history
drivers/usb/musb/omap2430.h	diff1 \|	\|	blob \| history
drivers/usb/musb/tusb6010_omap.c	diff1 \|	\|	blob \| history
drivers/video/backlight/omap_bl.c	diff1 \|	\|	blob \| history
drivers/video/omap/blizzard.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap/dispc.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap/lcd_2430sdp.c	diff1 \|	\|	blob \| history
drivers/video/omap/lcd_ams_delta.c	diff1 \|	\|	blob \| history
drivers/video/omap/lcd_apollon.c	diff1 \|	\|	blob \| history
drivers/video/omap/lcd_h2.c	diff1 \|	\|	blob \| history
drivers/video/omap/lcd_mipid.c	diff1 \|	\|	blob \| history
drivers/video/omap/lcd_omap2evm.c	diff1 \|	\|	blob \| history
drivers/video/omap/lcd_omap3beagle.c	diff1 \|	\|	blob \| history
drivers/video/omap/lcd_omap3evm.c	diff1 \|	\|	blob \| history
drivers/video/omap/lcd_p2.c	diff1 \|	\|	blob \| history
drivers/video/omap/omapfb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap/rfbi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap/sossi.c	diff1 \|	diff2 \|	blob \| history
drivers/w1/masters/omap_hdq.c	diff1 \|	\|	blob \| history
drivers/watchdog/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/watchdog/omap_wdt.c	diff1 \|	diff2 \|	blob \| history
include/linux/i2c-id.h	diff1 \|	diff2 \|	blob \| history
include/linux/i2c/twl4030.h	diff1 \|	\|	blob \| history
sound/arm/omap/eac.c	diff1 \|	\|	blob \| history
sound/arm/omap/omap-alsa-aic23-mixer.c	diff1 \|	\|	blob \| history
sound/arm/omap/omap-alsa-aic23.c	diff1 \|	\|	blob \| history
sound/arm/omap/omap-alsa-aic23.h	diff1 \|	\|	blob \| history
sound/arm/omap/omap-alsa-dma.c	diff1 \|	\|	blob \| history
sound/arm/omap/omap-alsa-dma.h	diff1 \|	\|	blob \| history
sound/arm/omap/omap-alsa-sx1.c	diff1 \|	\|	blob \| history
sound/arm/omap/omap-alsa-tsc2101.c	diff1 \|	\|	blob \| history
sound/arm/omap/omap-alsa-tsc2102-mixer.c	diff1 \|	\|	blob \| history
sound/arm/omap/omap-alsa-tsc2102.c	diff1 \|	\|	blob \| history
sound/arm/omap/omap-alsa.c	diff1 \|	\|	blob \| history
sound/oss/omap-audio-aic23.c	diff1 \|	\|	blob \| history
sound/oss/omap-audio-dma-intfc.c	diff1 \|	\|	blob \| history
sound/oss/omap-audio-tsc2101.c	diff1 \|	\|	blob \| history
sound/oss/omap-audio.c	diff1 \|	\|	blob \| history
sound/oss/omap-audio.h	diff1 \|	\|	blob \| history