Merge branch 'master' into for-linus
commitab11b487402f97975f3ac1eeea09c82f4431481e
authorChris Metcalf <cmetcalf@tilera.com>
Fri, 6 Aug 2010 14:37:02 +0000 (6 10:37 -0400)
committerChris Metcalf <cmetcalf@tilera.com>
Fri, 6 Aug 2010 14:37:02 +0000 (6 10:37 -0400)
tree86337c5cbbd2b0c4bd07c0847a1dc7de3d898147
parent1c689cbcf2c2b7a35cd237abddd9206bb1b6fee1
parentfc1caf6eafb30ea185720e29f7f5eccca61ecd60
Merge branch 'master' into for-linus
MAINTAINERS
include/linux/types.h