]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Sep 2006 00:39:04 +0000 (17:39 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Sep 2006 00:39:04 +0000 (17:39 -0700)
commit22f0e30e0f6e8e40580500cbc6b380e056a7e791
tree8a9b5c5937f6fa0167de090dd199b964ec803d5a
parent46902aa840e5602db69652a1ecd99acf3c158012
parentec993a7152ed796ac114d8e468928be63691e888
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.