Merge branch 'master' into for-linus
authorChris Metcalf <cmetcalf@tilera.com>
Sat, 5 Jun 2010 14:35:29 +0000 (10:35 -0400)
committerChris Metcalf <cmetcalf@tilera.com>
Sat, 5 Jun 2010 14:35:29 +0000 (10:35 -0400)
1  2 
MAINTAINERS
include/linux/syscalls.h

diff --cc MAINTAINERS
Simple merge
Simple merge