Skip to content
GitLab
Commit ea77f7a2 authored by Eric Paris's avatar Eric Paris
Browse files

Merge commit 'v2.6.39' into 20110526 

Conflicts:
	lib/flex_array.c
	security/selinux/avc.c
	security/selinux/hooks.c
	security/selinux/ss/policydb.c
	security/smack/smack_lsm.c
parents 7a627e3b 61c4f2c8
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment