git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d5aefb ec0bf39)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Howells <dhowells@redhat.com>
Wed, 6 Dec 2006 15:01:18 +0000 (15:01 +0000)
committerDavid Howells <dhowells@warthog.cambridge.redhat.com>
Wed, 6 Dec 2006 15:01:18 +0000 (15:01 +0000)
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>

Trivial merge
Pandora Kernel Repository