]> 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: 1bd58c8 b727946)
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 8 Jul 2008 08:00:13 +0000 (11:00 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 8 Jul 2008 08:00:13 +0000 (11:00 +0300)
commit7786cd7a00ae0b18923185789380a88052f4eee7
treefa4387ab58c9c5b6bcdf6fd3d954c112b82d91c8tree | snapshot
parent1bd58c8acf1947f133f1d7796caa8ffd6b5c3895commit | diff
parentb7279469d66b55119784b8b9529c99c1955fe747commit | diff
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

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
Unnamed repository; edit this file 'description' to name the repository.