git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
David Howells
authored
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>