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: fbf6af0 06bdadd)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 16 Jan 2014 03:14:20 +0000 (14:14 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 16 Jan 2014 03:14:20 +0000 (14:14 +1100)
commit	5aeeec9f5f567f474722a2eaacbfe166de183bb6
tree	474b6262921e0cc90337f56e64044bd99800d516	tree \| snapshot
parent	fbf6af038fd9bc23faa60bae23f4252c1fff2c02	commit \| diff
parent	06bdadd7634551cfe8ce071fe44d0311b3033d9e	commit \| diff

Merge remote-tracking branch 'audit/master'

Conflicts:
include/net/xfrm.h

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
include/linux/init_task.h	diff1 \|	diff2 \|	blob \| history
include/net/netlabel.h	diff1 \|	diff2 \|	blob \| history
include/net/xfrm.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/audit.h	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_state.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
security/selinux/ss/services.c	diff1 \|	diff2 \|	blob \| history
security/smack/smack_lsm.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules