]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a4625e adee14b)
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Wed, 10 Sep 2008 17:27:10 +0000 (10:27 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 10 Sep 2008 17:27:10 +0000 (10:27 -0700)
Merge branches 'master' and 'linus'

Conflicts:

arch/arm/mach-omap1/mcbsp.c
arch/arm/mach-omap2/mcbsp.c
arch/arm/plat-omap/include/mach/mcbsp.h
arch/arm/plat-omap/mcbsp.c

1  2 
Makefile patch | diff1 | diff2 | blob | history
drivers/media/radio/Makefile patch | diff1 | diff2 | blob | history
drivers/media/video/Makefile patch | diff1 | diff2 | blob | history
drivers/serial/8250.c patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc drivers/media/radio/Makefile
Simple merge
diff --cc drivers/media/video/Makefile
Simple merge
diff --cc drivers/serial/8250.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.