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: 180cad8 6bce98e)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 22 Sep 2011 06:29:04 +0000 (16:29 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 22 Sep 2011 06:29:04 +0000 (16:29 +1000)
commit	43a0d067294fbb7afe540d1e011de1337ddb38c4
tree	4497685adc9155ef47c70861fb4fa0c592bcd1e1	tree \| snapshot
parent	180cad81351afec0795ba3e7b81386bbba7bebf9	commit \| diff
parent	6bce98edc3365a8f780ff3944ac7992544c194fe	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
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