]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fe2c080 b8291ad)
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Mon, 19 May 2008 19:02:14 +0000 (12:02 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 19 May 2008 19:02:14 +0000 (12:02 -0700)
commitf4eb51b909144550048b7922ebd1904a54005394
tree88c9f65cdfc77f68bd938ba843ce455f3f0404batree | snapshot
parentfe2c08002adea304a13ccb806aa1ab4058607094commit | diff
parentb8291ad07a7f3b5b990900f0001198ac23ba893ecommit | diff
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/clock34xx.h
arch/arm/plat-omap/dma.c
MAINTAINERS diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
drivers/media/video/Kconfig diff1 | diff2 | blob | history
drivers/media/video/Makefile diff1 | diff2 | blob | history
drivers/net/Kconfig diff1 | diff2 | blob | history
drivers/spi/Kconfig diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.