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

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

author	Tony Lindgren <tony@atomide.com>
	Wed, 5 Mar 2008 08:33:15 +0000 (10:33 +0200)
committer	Tony Lindgren <tony@atomide.com>
	Wed, 5 Mar 2008 08:33:15 +0000 (10:33 +0200)
commit	e2fbfd6bd4e61fbfc94c95420df63e1b10862a3c
tree	211de1d991e2700c02d18daf99a32a0489357932	tree \| snapshot
parent	c7597836510336e3d1e9d09e82fcc9d322ba5c61	commit \| diff
parent	29e8c3c304b62f31b799565c9ee85d42bd163f80	commit \| diff

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

drivers/rtc/Kconfig

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