Pandora Sourcecodes - pandora-kernel.git/commit

git.openpandora.org / pandora-kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1bd58c8 b727946)

author	Tony Lindgren <tony@atomide.com>
	Tue, 8 Jul 2008 08:00:13 +0000 (11:00 +0300)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 8 Jul 2008 08:00:13 +0000 (11:00 +0300)
commit	7786cd7a00ae0b18923185789380a88052f4eee7
tree	fa4387ab58c9c5b6bcdf6fd3d954c112b82d91c8	tree \| snapshot
parent	1bd58c8acf1947f133f1d7796caa8ffd6b5c3895	commit \| diff
parent	b7279469d66b55119784b8b9529c99c1955fe747	commit \| 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

Pandora Kernel Repository