Eric Paris ea77f7a2e8 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

2011-05-26 17:20:14 -04:00

..

Kconfig

…

Makefile

…

smack_access.c

…

smack_lsm.c

…

smack.h

…

smackfs.c

…