www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

author	Tony Lindgren <tony@atomide.com>
	Fri, 3 Apr 2009 00:10:56 +0000 (17:10 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Fri, 3 Apr 2009 00:10:56 +0000 (17:10 -0700)
commit	0595ee8a05836666b225e6bf003ede0da1e6e329
tree	dc64d1c9633f0493320ccff25b7e6745e5d284b5	tree \| snapshot
parent	eba05254cb561dc27d5664503f91f7c21954e648	commit \| diff
parent	833bb3046b6cb320e775ea2160ddca87d53260d5	commit \| diff

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:
arch/arm/configs/omap_3430sdp_defconfig
arch/arm/configs/rx51_defconfig
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/mmc-twl4030.c
arch/arm/mach-omap2/mmc-twl4030.h
arch/arm/mach-omap2/usb-musb.c
arch/arm/plat-omap/dma.c
arch/arm/plat-omap/include/mach/board-nokia.h
arch/arm/plat-omap/include/mach/irqs.h
arch/arm/plat-omap/include/mach/usb.h
drivers/Makefile
drivers/i2c/chips/Kconfig
drivers/video/omap/omapfb_main.c
net/ipv4/netfilter/Makefile

41 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/setup.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/gpio.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/irqs.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/sram.c	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/char/hw_random/omap-rng.c	diff1 \|	diff2 \|	blob \| history
drivers/crypto/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/crypto/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/lm8323.c	diff1 \|	\|	blob \| history
drivers/input/keyboard/tsc2301_kp.c	diff1 \|	\|	blob \| history
drivers/input/touchscreen/tsc2005.c	diff1 \|	\|	blob \| history
drivers/input/touchscreen/tsc2301_ts.c	diff1 \|	\|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/omap-nand-flash.c	diff1 \|	\|	blob \| history
drivers/mtd/nand/omap2.c	diff1 \|	\|	blob \| history
drivers/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/omap2_mcspi.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap/omapfb_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/connector.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/Kconfig	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/Makefile	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/setup.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/gpio.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/irqs.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/sram.c	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/char/hw_random/omap-rng.c	diff1 \|	diff2 \|	blob \| history
drivers/crypto/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/crypto/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/lm8323.c	diff1 \|	\|	blob \| history
drivers/input/keyboard/tsc2301_kp.c	diff1 \|	\|	blob \| history
drivers/input/touchscreen/tsc2005.c	diff1 \|	\|	blob \| history
drivers/input/touchscreen/tsc2301_ts.c	diff1 \|	\|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/omap-nand-flash.c	diff1 \|	\|	blob \| history
drivers/mtd/nand/omap2.c	diff1 \|	\|	blob \| history
drivers/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/omap2_mcspi.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap/omapfb_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/connector.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/Kconfig	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/Makefile	diff1 \|	diff2 \|	blob \| history