Merge commit 'gcl/gcl-next'

author Benjamin Herrenschmidt <benh@kernel.crashing.org>

Tue, 15 Jul 2008 01:55:27 +0000 (11:55 +1000)

committer Benjamin Herrenschmidt <benh@kernel.crashing.org>

Tue, 15 Jul 2008 01:55:27 +0000 (11:55 +1000)
author Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 15 Jul 2008 01:55:27 +0000 (11:55 +1000)
committer Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 15 Jul 2008 01:55:27 +0000 (11:55 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
author	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Tue, 15 Jul 2008 01:55:27 +0000 (11:55 +1000)
committer	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Tue, 15 Jul 2008 01:55:27 +0000 (11:55 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history