Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 23 Apr 2007 18:13:19 +0000 (11:13 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 23 Apr 2007 18:13:19 +0000 (11:13 -0700)
commit66c7d2f1d9cb19e46717b26fb49550b5e82985fe
treedd9624a28fe20cefa2fd4390abd0e0fa611f3a7e
parent36e82dfda526e2dea26060e8766bda5a8110c4e6
parentc3b99f0db9b2ef4292ef774bae1ea0d6f1e8d82a
Merge /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