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>
	Tue, 7 Apr 2009 22:55:24 +0000 (15:55 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 7 Apr 2009 22:55:24 +0000 (15:55 -0700)
commit	ed2a95f3ce60fe24fea59633d19e8f6d993ec4ea
tree	20c50d7636209cb6badf0add3207073f356e2a2a	tree \| snapshot
parent	24449b49ec00d239c737dd93e76b198d5c0f9312	commit \| diff
parent	1abccbf41c01c6e69887363cb8053229288137fd	commit \| diff

Merge branch 'omap-pool'

Conflicts:
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-overo.c
drivers/regulator/core.c
drivers/regulator/twl4030-regulator.c
include/linux/i2c/twl4030.h
include/linux/regulator/driver.h

20 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/omap_ldp_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-overo.c	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/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/mfd/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/cmdlinepart.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/Makefile	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
include/linux/connector.h	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/omap_ldp_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-overo.c	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/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/mfd/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/cmdlinepart.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/Makefile	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
include/linux/connector.h	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history