www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7ad6ef0 5d9c4a7)

author	Tony Lindgren <tony@atomide.com>
	Thu, 21 Feb 2008 00:06:31 +0000 (16:06 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 21 Feb 2008 00:06:31 +0000 (16:06 -0800)
commit	496acbbfe6344bf7a61b6dd6b9249ec0ca06b568
tree	58812ef4c575e09d06a91f3964b86b509a89c6ad	tree \| snapshot
parent	7ad6ef020bbfa40d93abf43d9f6af5f553034020	commit \| diff
parent	5d9c4a7de64d398604a978d267a6987f1f4025b7	commit \| diff

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
drivers/media/radio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/watchdog/Kconfig	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.