From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 Jul 2011 20:29:26 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.12-rc1~5362
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a5c3743f15f27237ab025736a981e2d0c9fdfed;p=kernel%2Fkernel-generic.git

Merge git://git./linux/kernel/git/davem/net-2.6

* 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
---

3a5c3743f15f27237ab025736a981e2d0c9fdfed