diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-07 12:35:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-07 12:35:54 -0400 |
| commit | 7244d545c123ff33a3a5bff7fcb96a07778c32d1 (patch) | |
| tree | c4d2893faa844e4cd6e2b47bbd2663dc28d9af83 /drivers/net/bnx2.c | |
| parent | 143a275984b37058d2d3ab1ec0e5be9026fda24d (diff) | |
| parent | e7e8cc5ae63c39dbbbb5f14c5120bdf2d931fac9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[VIDEO] sunxvr500fb: Fix pseudo_palette array size
[VIDEO] sunxvr2500fb: Fix pseudo_palette array size
[VIDEO] ffb: The pseudo_palette is only 16 elements long
[VIDEO]: Fix section mismatch warning in promcon.
[ATA]: Back out bogus (SPARC64 && !PCI) Kconfig depends.
[SPARC64]: Fill in gaps in non-PCI dma_*() NOP implementation.
[SPARC64]: Fix {mc,smt}_capable().
[SPARC64]: Make core and sibling groups equal on UltraSPARC-IV.
[SPARC64]: Proper multi-core scheduling support.
[SPARC64]: Provide mmu statistics via sysfs.
[SPARC64]: Fix service channel hypervisor function names.
[SPARC64]: Export basic cpu properties via sysfs.
[SPARC64]: Move topology init code into new file, sysfs.c
Diffstat (limited to 'drivers/net/bnx2.c')
0 files changed, 0 insertions, 0 deletions