Jiri Kosina d014d04386 Merge branch 'for-next' into for-linus ...

Conflicts:

	kernel/irq/chip.c

2009-12-07 18:36:35 +01:00

..

avtab.c

…

avtab.h

…

conditional.c

…

conditional.h

…

constraint.h

…

context.h

SELinux: shrink sizeof av_inhert selinux_class_perm and context

2009-01-05 19:19:55 +11:00

ebitmap.c

…

ebitmap.h

…

hashtab.c

…

hashtab.h

…

Makefile

selinux: generate flask headers during kernel build

2009-10-07 21:56:44 +11:00

mls_types.h

…

mls.c

selinux: dynamic class/perm discovery

2009-10-07 21:56:42 +11:00

mls.h

…

policydb.c

selinux: dynamic class/perm discovery

2009-10-07 21:56:42 +11:00

policydb.h

selinux: dynamic class/perm discovery

2009-10-07 21:56:42 +11:00

services.c

Merge branch 'for-next' into for-linus

2009-12-07 18:36:35 +01:00

services.h

…

sidtab.c

…

sidtab.h

…

symtab.c

…

symtab.h

…