| commit | 7b29122f9ec54db5c38a66a11127d94db0817c17 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Sep 25 17:39:04 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Sep 25 17:39:04 2006 -0700 |
| tree | 8a9b5c5937f6fa0167de090dd199b964ec803d5a | |
| parent | b7de567bf3187ccf776e2fe0e241593cdcba5459 [diff] | |
| parent | be5b6d3d6cb7311893c9fbeebf094591d5f760a8 [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: [SOUND] sparc/amd7930: Use __devinit and __devinitdata as needed. [SUNLANCE]: Mark sparc_lance_probe_one as __devinit. [SPARC64]: Fix section-mismatch errors in solaris emul module.