git.agner.ch Git - linux-drm-fsl-dcu.git/commit

projects / linux-drm-fsl-dcu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f3411cb d8ec26d)

author	Eric Paris <eparis@redhat.com>
	Fri, 7 Mar 2014 16:41:32 +0000 (11:41 -0500)
committer	Eric Paris <eparis@redhat.com>
	Fri, 7 Mar 2014 16:41:32 +0000 (11:41 -0500)
commit	b7d3622a39fde7658170b7f3cf6c6889bb8db30d
tree	64f4e781ecb2a85d675e234072b988560bcd25f1	tree \| snapshot
parent	f3411cb2b2e396a41ed3a439863f028db7140a34	commit \| diff
parent	d8ec26d7f8287f5788a494f56e8814210f0e64be	commit \| diff

Merge tag 'v3.13' into for-3.15

Linux 3.13

Conflicts:
include/net/xfrm.h

Simple merge where v3.13 removed 'extern' from definitions and the audit
tree did s/u32/unsigned int/ to the same definitions.

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
include/linux/init_task.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
security/selinux/ss/services.c	diff1 \|	diff2 \|	blob \| history
security/smack/smack_lsm.c	diff1 \|	diff2 \|	blob \| history

Freescale DCU DRM driver