tree 15e3ead6413ae97398a54292acc199bee0864d42
parent 4c1ac1b49122b805adfa4efc620592f68dccf5db
parent e62438630ca37539c8cc1553710bbfaa3cf960a7
author David Howells <dhowells@redhat.com> 1165338088 +0000
committer David Howells <dhowells@warthog.cambridge.redhat.com> 1165338088 +0000

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>