Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jul 2011 20:29:26 +0000 (13:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jul 2011 20:29:26 +0000 (13:29 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  pppoe: Must flush connections when MAC address changes too.
  include/linux/sdla.h: remove the prototype of sdla()
  tulip: dmfe: Remove old log spamming pr_debugs


Trivial merge