kevin/linux
1
Fork 0
Code
4c1ac1b491
linux/drivers/spi
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

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

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
Kconfig Fix misc Kconfig typos 2006-11-30 05:22:59 +01:00
Makefile
pxa2xx_spi.c Various drivers' irq handlers: kill dead code, needless casts 2006-10-06 15:00:58 -04:00
spi_bitbang.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
spi_butterfly.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
spi_mpc83xx.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
spi_s3c24xx_gpio.c Remove all inclusions of <linux/config.h> 2006-10-04 03:38:54 -04:00
spi_s3c24xx.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
spi.c [PATCH] spi section fix 2006-11-03 12:27:58 -08:00