Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6

8ed57590 · Linus Torvalds · 27d1097d · 210cc679 · 8ed57590 · 8ed57590
Commit 8ed57590 authored 19 years ago by Linus Torvalds
20 changed files
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
--- a/drivers/parisc/ccio-rm-dma.c
+++ b/drivers/parisc/ccio-rm-dma.c
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
--- a/drivers/parisc/hppb.c
+++ b/drivers/parisc/hppb.c
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
--- a/drivers/parisc/lasi.c
+++ b/drivers/parisc/lasi.c
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
--- a/drivers/parisc/wax.c
+++ b/drivers/parisc/wax.c
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
--- a/drivers/scsi/lasi700.c
+++ b/drivers/scsi/lasi700.c
--- a/drivers/scsi/zalon.c
+++ b/drivers/scsi/zalon.c
--- a/drivers/serial/8250_gsc.c
+++ b/drivers/serial/8250_gsc.c
--- a/drivers/serial/mux.c
+++ b/drivers/serial/mux.c
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig