diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-23 12:25:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-23 12:25:24 -0400 |
| commit | 12a37b5e2c93f6550b82490c3de6d4eedc509c39 (patch) | |
| tree | 8407735b0d569792ec255a2627b533e403d60663 /drivers/net/macb.h | |
| parent | 53da1d9456fe7f87a920a78fdbdcf1225d197cb7 (diff) | |
| parent | 0702b30dd821ac8a4103ddbe545518713fdca9be (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix crash with /proc/iomem
sparc64: Reschedule KGDB capture to a software interrupt.
sbus: Auto-load openprom module when device opened.
Diffstat (limited to 'drivers/net/macb.h')
0 files changed, 0 insertions, 0 deletions