From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 26 Sep 2006 00:39:04 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7b29122f9ec54db5c38a66a11127d94db0817c17;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge /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.
---

7b29122f9ec54db5c38a66a11127d94db0817c17