diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 14:45:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 14:45:42 -0700 |
commit | 344a7829c421ce6c626cb94c6576f66a7c28a871 (patch) | |
tree | fee700ededa9c7962605b611379328aeb0579de1 /drivers/net/netxen | |
parent | 8e82f8c34b1759ae0d80fe96101746ec51fb1ba4 (diff) | |
parent | 7d4ee289d139d27b619c08c9809e7b1088c100aa (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:
sparc: Fix user_regset 'n' field values.
sparc64: Fix PCI error interrupt registry on PSYCHO.
sparc32: Fix function signature of of_bus_sbus_get_flags().
sparc64: Fix interrupt register calculations on Psycho and Sabre.
Diffstat (limited to 'drivers/net/netxen')
0 files changed, 0 insertions, 0 deletions