]> err.no Git - linux-2.6/commitdiff
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)
* 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


Trivial merge