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: fe61e97 f8859d9)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Oct 2011 03:10:55 +0000 (14:10 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Oct 2011 03:10:55 +0000 (14:10 +1100)
commit	d3a4026e732ee010a63fdad55ca450bc1056825c
tree	db8b553e30a2489928920463806e0780134d7725	tree \| snapshot
parent	fe61e979586c3d676793004f07a2cce20aa1758a	commit \| diff
parent	f8859d98c1d1e73393285fb9dd57007839956247	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