Merge branch 'master' into for-linus

author Chris Metcalf <[email protected]>

Fri, 6 Aug 2010 14:37:02 +0000 (10:37 -0400)

committer Chris Metcalf <[email protected]>

Fri, 6 Aug 2010 14:37:02 +0000 (10:37 -0400)
author Chris Metcalf <[email protected]>
Fri, 6 Aug 2010 14:37:02 +0000 (10:37 -0400)
committer Chris Metcalf <[email protected]>
Fri, 6 Aug 2010 14:37:02 +0000 (10:37 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/types.h
Simple merge
author	Chris Metcalf <[email protected]>
	Fri, 6 Aug 2010 14:37:02 +0000 (10:37 -0400)
committer	Chris Metcalf <[email protected]>
	Fri, 6 Aug 2010 14:37:02 +0000 (10:37 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/types.h	patch \|	diff1 \|	diff2 \|	blob \| history