From: David Howells <dhowells@redhat.com>
Date: Wed, 6 Dec 2006 15:01:18 +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~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4796b71fbb907ce6b8a9acf1852d3646a80b4576;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pcmcia/ds.c

Fix up merge failures with Linus's head and fix new compile failures.

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

4796b71fbb907ce6b8a9acf1852d3646a80b4576
Reading git-diff-tree failed