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

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

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

author	Tony Lindgren <tony@atomide.com>
	Mon, 5 May 2008 20:21:13 +0000 (13:21 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Mon, 5 May 2008 20:21:13 +0000 (13:21 -0700)
commit	3f35ebfdc4b987abe923eee79d25a04e336dee56
tree	f01918b2183dff30414750449d8a1c04fb15f6f8	tree \| snapshot
parent	547ba9200727d2334f779cbf46ab62accb1281aa	commit \| diff
parent	5717922a1b8cc477f45a0f4f11fe619392ba7133	commit \| diff

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

arch/arm/mach-omap1/board-h3.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/media/video/Kconfig
drivers/misc/Kconfig
include/linux/kfifo.h
security/Makefile

38 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	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/mm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/menelaus.c	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/omap-keypad.c	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/ads7846.c	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/leds/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mtd/cmdlinepart.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/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/serial/8250.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/omap_udc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-omap.c	diff1 \|	diff2 \|	blob \| history
include/asm-arm/pgtable.h	diff1 \|	diff2 \|	blob \| history
include/linux/i2c-id.h	diff1 \|	diff2 \|	blob \| history
include/linux/kfifo.h	diff1 \|	diff2 \|	blob \| history
include/linux/poison.h	diff1 \|	diff2 \|	blob \| history
include/linux/spi/ads7846.h	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
security/Makefile	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	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/mm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/menelaus.c	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/omap-keypad.c	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/ads7846.c	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/leds/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mtd/cmdlinepart.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/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/serial/8250.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/omap_udc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-omap.c	diff1 \|	diff2 \|	blob \| history
include/asm-arm/pgtable.h	diff1 \|	diff2 \|	blob \| history
include/linux/i2c-id.h	diff1 \|	diff2 \|	blob \| history
include/linux/kfifo.h	diff1 \|	diff2 \|	blob \| history
include/linux/poison.h	diff1 \|	diff2 \|	blob \| history
include/linux/spi/ads7846.h	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
security/Makefile	diff1 \|	diff2 \|	blob \| history