Merge branch 'master' into next

author Kim Phillips <kim.phillips@freescale.com>

Thu, 22 Jan 2009 00:38:51 +0000 (18:38 -0600)

committer Kim Phillips <kim.phillips@freescale.com>

Thu, 22 Jan 2009 00:38:51 +0000 (18:38 -0600)
author Kim Phillips <kim.phillips@freescale.com>
Thu, 22 Jan 2009 00:38:51 +0000 (18:38 -0600)
committer Kim Phillips <kim.phillips@freescale.com>
Thu, 22 Jan 2009 00:38:51 +0000 (18:38 -0600)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Kim Phillips <kim.phillips@freescale.com>
	Thu, 22 Jan 2009 00:38:51 +0000 (18:38 -0600)
committer	Kim Phillips <kim.phillips@freescale.com>
	Thu, 22 Jan 2009 00:38:51 +0000 (18:38 -0600)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history