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: 49de873 8de6ac7)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 15 Sep 2011 04:26:18 +0000 (14:26 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 15 Sep 2011 04:26:18 +0000 (14:26 +1000)
commit	d85a05b76686c3ec46dd768905da1eaa60e8d94a
tree	009341e1f9d582c25f1d5f486a9bc54b6f6d2f1b	tree \| snapshot
parent	49de873010d500bac7b2237124578350a07edd19	commit \| diff
parent	8de6ac7f58a22fdab399fbe97763e465ea49c735	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