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

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

projects / karo-tx-linux.git / commit

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 5 Oct 2011 04:28:08 +0000 (15:28 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 5 Oct 2011 04:28:08 +0000 (15:28 +1100)
commit	129fd825bf10768447c1065b583c71bc07daa653
tree	132142d293822c2b6ce345ca623a4476bac59af5	tree \| snapshot
parent	0bbaa53db5fca28326a19e3879c7e3967e61e7bc	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