David Howells 9db7372445 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

Signed-Off-By: David Howells <dhowells@redhat.com>

2006-12-05 17:01:28 +00:00

..

keys

WorkStruct: Pass the work_struct pointer instead of context data

2006-11-22 14:55:48 +00:00

selinux

[PATCH] selinux endianness annotations

2006-12-04 19:32:44 -08:00

capability.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

commoncap.c

[PATCH] pidspace: is_init()

2006-09-29 09:18:12 -07:00

dummy.c

SELinux: Fix SA selection semantics

2006-12-02 21:21:34 -08:00

inode.c

[PATCH] r/o bind mount prepwork: inc_nlink() helper

2006-10-01 00:39:30 -07:00

Kconfig

[PATCH] LSM: remove BSD secure level security module

2006-09-29 09:18:10 -07:00

Makefile

[PATCH] LSM: remove BSD secure level security module

2006-09-29 09:18:10 -07:00

root_plug.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

security.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00