Merge branch '85xx' into for_paulus

author Kumar Gala <galak@kernel.crashing.org>

Sat, 17 Feb 2007 00:21:18 +0000 (18:21 -0600)

committer Kumar Gala <galak@kernel.crashing.org>

Sat, 17 Feb 2007 00:21:18 +0000 (18:21 -0600)
author Kumar Gala <galak@kernel.crashing.org>
Sat, 17 Feb 2007 00:21:18 +0000 (18:21 -0600)
committer Kumar Gala <galak@kernel.crashing.org>
Sat, 17 Feb 2007 00:21:18 +0000 (18:21 -0600)
diff --cc arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
Simple merge
author	Kumar Gala <galak@kernel.crashing.org>
	Sat, 17 Feb 2007 00:21:18 +0000 (18:21 -0600)
committer	Kumar Gala <galak@kernel.crashing.org>
	Sat, 17 Feb 2007 00:21:18 +0000 (18:21 -0600)