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: 0d0c2e2 6bce98e)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 20 Sep 2011 04:20:23 +0000 (14:20 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 20 Sep 2011 04:20:23 +0000 (14:20 +1000)
commit	fe32f2c602a69b8ff4e4630f9233ba0e5f4b488f
tree	7934e40a82a6b86dc24cc80ee20652a53eb56921	tree \| snapshot
parent	0d0c2e2c664b6b6250e0a3cb21d000fecc80d4ce	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