]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7fdfb43 fd152eb)
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)
commitcf643ce88b5992c5e4c3458c64c64ff6a045260a
tree98a3741b4d4b27a48b3c7ea9babe331e539416a8tree | snapshot
parent7fdfb43740bb93d35d7c44a1623b547bf8e2e023commit | diff
parentfd152ebc3c8c5b437915bbd7b1cdb3557925c74fcommit | diff
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 diff1 | diff2 | blob | history
drivers/char/tpm/tpm.c diff1 | diff2 | blob | history
include/linux/security.h diff1 | diff2 | blob | history
kernel/printk.c diff1 | diff2 | blob | history
security/smack/smack_lsm.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.