From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 23 Apr 2007 18:13:19 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: Ubuntu-5.10.0-12.13~49018
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=66c7d2f1d9cb19e46717b26fb49550b5e82985fe;p=mirror_ubuntu-hirsute-kernel.git

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:
  [SUNHME]: Fix module unload.
  [SUNLANCE]: Fix module unload.
  [SUNQE]: Fix MAC address assignment.
  [SBUS] vfc_dev.c: kzalloc
---

66c7d2f1d9cb19e46717b26fb49550b5e82985fe