Merge branch 'master' into for-linus
Chris Metcalf [Fri, 6 Aug 2010 14:37:02 +0000 (10:37 -0400)]
1  2 
MAINTAINERS
include/linux/types.h

diff --cc MAINTAINERS
Simple merge
Simple merge