tree 20d55db1f93294f006ce79156a05652dfa7a8048
parent e5eca6aef6a2a57e433db1eac247d2d1c213ce08
parent 8a53514043e380aa573baa805298a7727c993985
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1193155186 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1193155186 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: always check SIGCHLD in selinux_task_wait