]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/i2c/chips/twl4030-madc.c
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 17 Jun 2008 10:46:24 +0000 (13:46 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 17 Jun 2008 10:46:24 +0000 (13:46 +0300)
commit5b97d3ec6732c87741b2fc04f2956f097a458818
tree24c60b94dd0a824ddb87bd9b6946697020086415
parentdf96d1729fc438f767aa5fc5ff43a29c470ad2e9
parentdf96d1729fc438f767aa5fc5ff43a29c470ad2e9
parent5dd34572ad9a3be430632dd42e4af2ea370b397b
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
MAINTAINERS
Makefile
drivers/mtd/maps/omap_nor.c
drivers/net/Kconfig
drivers/net/irda/Kconfig
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/usb/host/Kconfig