git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f67c332 e00fb3f)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 6 Oct 2011 03:01:49 +0000 (14:01 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 6 Oct 2011 03:01:49 +0000 (14:01 +1100)
commit	dddb1b0b9cb0978cdd9cf1a361f3e38a48da8733
tree	670c7b7778fede972ddc0400f31850a3ccf2eb38	tree \| snapshot
parent	f67c332d8e9770522fdeac0b0ef9c179da98fed6	commit \| diff
parent	e00fb3f7af111d1b3252f7d622213d2e22be65f5	commit \| diff

Merge remote-tracking branch 'security/next'

Conflicts:
fs/ocfs2/xattr.c

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/char/tpm/tpm.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/xattr.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/inode.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_iops.c	diff1 \|	diff2 \|	blob \| history
kernel/cred.c	diff1 \|	diff2 \|	blob \| history
security/tomoyo/common.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules