tree 6263f165446c581efdbb760205c1f85378fe6259
parent 6d5aefb8eaa38e44b5b8cf60c812aceafc02d924
parent ec0bf39a471bf6fcd01def2bd677128cea940b73
author David Howells <dhowells@redhat.com> 1165417278 +0000
committer David Howells <dhowells@warthog.cambridge.redhat.com> 1165417278 +0000

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