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: 08a6342 403d1d0)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 5 Sep 2011 05:15:44 +0000 (15:15 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 5 Sep 2011 05:15:44 +0000 (15:15 +1000)
commit	9a6e302ff29237e75f63eeea4464e5108e8d9d0c
tree	045cddd8f966d51de0db0f70f8cb969ff3df5bf4	tree \| snapshot
parent	08a63421660943c21ce5c041590debd59d2b0e63	commit \| diff
parent	403d1d0319ad73b5ccf251745af4c7000331a76b	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/gfs2/inode.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_iops.c	diff1 \|	diff2 \|	blob \| history
kernel/cred.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules