Public Git Hosting - linux-2.6/openmoko-kernel/knife-kernel.git/commit

commit	4796b71fbb907ce6b8a9acf1852d3646a80b4576
author	David Howells <dhowells@redhat.com>
	Wed, 6 Dec 2006 15:01:18 +0000 (6 15:01 +0000)
committer	David Howells <dhowells@warthog.cambridge.redhat.com>
	Wed, 6 Dec 2006 15:01:18 +0000 (6 15:01 +0000)
tree	6263f165446c581efdbb760205c1f85378fe6259	tree \| snapshot (tar.gz zip)
parent	6d5aefb8eaa38e44b5b8cf60c812aceafc02d924	commit \| diff
parent	ec0bf39a471bf6fcd01def2bd677128cea940b73	commit \| diff

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>

drivers/char/pcmcia/synclink_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/xirc2ps_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/ds.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ipr.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libsas/sas_init.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla4xxx/ql4_os.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_scan.c	diff1 \|	diff2 \|	blob \| history
include/scsi/libsas.h	diff1 \|	diff2 \|	blob \| history

Community contributions to the Openmoko Kernel

RSS Atom

drivers/char/pcmcia/synclink_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/xirc2ps_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/ds.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ipr.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libsas/sas_init.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla4xxx/ql4_os.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_scan.c	diff1 \|	diff2 \|	blob \| history
include/scsi/libsas.h	diff1 \|	diff2 \|	blob \| history