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)
commitcc44826a26b12b2489bc7dbb597fcdf107f2cc01
tree98a7958212ac61345300944f512a949e5ee3e513
parent482e6f8466ab1066f1a969bcdbe916b56439622c
parent7f0d384cafabfbb56663ee6944c18fc0450fc5d6
Merge branch 'master' into for-linus
MAINTAINERS
include/linux/syscalls.h