]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - arch/arm/mach-omap1/Makefile
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5db2e3b 9bf1a24)
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Mon, 17 Nov 2008 18:19:19 +0000 (10:19 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 17 Nov 2008 18:19:19 +0000 (10:19 -0800)
commite88af5fb139aa77131ebbc730a952e019c8f93c1
tree9aa5069cbe318cfdd08e40f5c8aaf1eae0e45669tree | snapshot
parent5db2e3bf888e483d777ebc98be7f07cafaf26f07commit | diff
parent9bf1a2445f3c569098b8de7097ca324e65abecc2commit | diff
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

drivers/w1/masters/omap_hdq.c
drivers/w1/slaves/Kconfig
drivers/w1/slaves/w1_bq27000.c
Makefile diff1 | diff2 | blob | history
drivers/hwmon/Kconfig diff1 | diff2 | blob | history
drivers/hwmon/Makefile diff1 | diff2 | blob | history
drivers/misc/Kconfig diff1 | diff2 | blob | history
drivers/misc/Makefile diff1 | diff2 | blob | history
drivers/usb/host/Kconfig diff1 | diff2 | blob | history
drivers/usb/host/ehci-hcd.c diff1 | diff2 | blob | history
drivers/usb/musb/omap2430.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.