| commit | 29e0937bb693879221f575b01f26314b3f443322 | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Mon, 14 May 2007 19:27:17 +0000 (14 12:27 -0700) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Mon, 14 May 2007 19:27:17 +0000 (14 12:27 -0700) | ||
| tree | dd3ed9be21ff200c9d4dd8c708bc2ea1ef3d32f4 | treesnapshot (tar.gz zip) |
| parent | 140ff8b0459cac5ade7a42131f561a9ee0fa3cc4 | commitdiff |
| parent | be35cf01a9889e82da3bbda1d7b161f036424225 | commitdiff |
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Update defconfig.
[VIDEO]: XVR-500 and XVR-2500 need FB=y.
[SPARC32]: asm/system.h needs asm/smp.h
[SPARC32]: Update defconfig.
[SPARC32]: Fix sparc32 kdebug changes.
[SPARC64]: Accept ebus_bus_type for generic DMA ops.
[SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling.
[SCSI]: Add help text for SCSI_ESP_CORE.
[SPARC] SBUS: display7seg.c needs asm/io.h
[SPARC] SBUS: bbc_i2c.c needs asm/io.h
[SPARC64]: Be more resiliant with PCI I/O space regs.
[SERIAL] SUNHV: Add an ID string.
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Update defconfig.
[VIDEO]: XVR-500 and XVR-2500 need FB=y.
[SPARC32]: asm/system.h needs asm/smp.h
[SPARC32]: Update defconfig.
[SPARC32]: Fix sparc32 kdebug changes.
[SPARC64]: Accept ebus_bus_type for generic DMA ops.
[SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling.
[SCSI]: Add help text for SCSI_ESP_CORE.
[SPARC] SBUS: display7seg.c needs asm/io.h
[SPARC] SBUS: bbc_i2c.c needs asm/io.h
[SPARC64]: Be more resiliant with PCI I/O space regs.
[SERIAL] SUNHV: Add an ID string.