diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-30 15:54:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-30 15:54:55 -0700 |
commit | df31405a9a240e8ea882953ea90736ff57b47643 (patch) | |
tree | 082b1c061f976a4f9031f7e44b77d50a959a28de /drivers/net/cs89x0.c | |
parent | 7c30b0653f1bcaf04f8abf24cad5c1e642a3da47 (diff) | |
parent | 404dda854b8bb04df72405d5088fa3e6100aef36 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SUNLANCE]: Fix probing problem.
[SPARC64]: Fix X server hangs due to large pages.
Diffstat (limited to 'drivers/net/cs89x0.c')
0 files changed, 0 insertions, 0 deletions