]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Sun, 18 Jan 2009 12:08:53 +0000 (14:08 +0200)
committerTony Lindgren <tony@atomide.com>
Sun, 18 Jan 2009 12:08:53 +0000 (14:08 +0200)
commit45e5c5ffd32ade5a21a5e87b4040072590ec3ae1
tree27674f7c99a134ec8bf59725d733d0f9339110f9
parentc699464bd92629fda1062223467588fcb0e97bca
parent1de9e8e70f5acc441550ca75433563d91b269bbe
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

drivers/i2c/chips/Kconfig
drivers/i2c/chips/Makefile
drivers/leds/Makefile
19 files changed:
Makefile
drivers/hwmon/Kconfig
drivers/hwmon/Makefile
drivers/i2c/chips/Kconfig
drivers/i2c/chips/Makefile
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/twl4030-core.c
drivers/misc/Makefile
drivers/power/Kconfig
drivers/power/Makefile
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/serial/8250.c
drivers/watchdog/Kconfig
include/linux/connector.h
kernel/printk.c