]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'omap-pool'
authorTony Lindgren <tony@atomide.com>
Tue, 7 Apr 2009 22:55:24 +0000 (15:55 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 7 Apr 2009 22:55:24 +0000 (15:55 -0700)
commited2a95f3ce60fe24fea59633d19e8f6d993ec4ea
tree20c50d7636209cb6badf0add3207073f356e2a2a
parent24449b49ec00d239c737dd93e76b198d5c0f9312
parent1abccbf41c01c6e69887363cb8053229288137fd
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
arch/arm/configs/omap_ldp_defconfig
arch/arm/mach-omap2/board-overo.c
drivers/hwmon/Kconfig
drivers/hwmon/Makefile
drivers/input/touchscreen/ads7846.c
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/mfd/Kconfig
drivers/misc/Kconfig
drivers/mmc/host/Kconfig
drivers/mmc/host/omap_hsmmc.c
drivers/mtd/cmdlinepart.c
drivers/mtd/maps/Kconfig
drivers/mtd/maps/Makefile
drivers/mtd/maps/omap_nor.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile
include/linux/connector.h
kernel/printk.c