]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/cbus/retu.h
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Sat, 12 Apr 2008 00:32:10 +0000 (17:32 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 12 Apr 2008 00:32:10 +0000 (17:32 -0700)
commitb87501204757e7c2deeddd94f4941b3e1dfd9a27
tree779989e973c789c965cfb18031c156bd63ec17c9
parent26aaa3df7e1fbd66c2935a4f4221dd5ab8834d7b
parent120dd64cacd4fb796bca0acba3665553f1d9ecaa
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
Makefile
drivers/rtc/Kconfig
drivers/usb/gadget/omap_udc.c
drivers/usb/host/ohci-omap.c
drivers/watchdog/omap_wdt.c