Merge branch 'quad100hd'

author Stefan Roese <[email protected]>

Wed, 21 May 2008 15:39:24 +0000 (17:39 +0200)

committer Stefan Roese <[email protected]>

Wed, 21 May 2008 15:39:24 +0000 (17:39 +0200)
author Stefan Roese <[email protected]>
Wed, 21 May 2008 15:39:24 +0000 (17:39 +0200)
committer Stefan Roese <[email protected]>
Wed, 21 May 2008 15:39:24 +0000 (17:39 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Stefan Roese <[email protected]>
	Wed, 21 May 2008 15:39:24 +0000 (17:39 +0200)
committer	Stefan Roese <[email protected]>
	Wed, 21 May 2008 15:39:24 +0000 (17:39 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history