From: David Howells <dhowells@redhat.com>
Date: Tue, 5 Dec 2006 17:01:28 +0000 (+0000)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.20-rc1~34^2~20^2~33^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9db73724453a9350e1c22dbe732d427e2939a5c9;p=pandora-kernel.git

Merge branch 'master' of git://git./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>
---

9db73724453a9350e1c22dbe732d427e2939a5c9
Reading git-diff-tree failed