]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Sun, 9 Jan 2011 22:46:24 +0000 (09:46 +1100)
committerJames Morris <jmorris@namei.org>
Sun, 9 Jan 2011 22:46:24 +0000 (09:46 +1100)
commitd2e7ad19229f982fc1eb731827d82ceac90abfb3
tree98a3741b4d4b27a48b3c7ea9babe331e539416a8
parentd03a5d888fb688c832d470b749acc5ed38e0bc1d
parent0c21e3aaf6ae85bee804a325aa29c325209180fd
Merge branch 'master' into next

Conflicts:
security/smack/smack_lsm.c

Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>

Signed-off-by: James Morris <jmorris@namei.org>
MAINTAINERS
drivers/char/tpm/tpm.c
include/linux/security.h
kernel/printk.c
security/smack/smack_lsm.c