tree 13fc4d89901c2e2e187cfb44ab904bc587b0ab9c
parent dc6b845044ccb7e9e6f3b7e71bd179b3cf0223b6
parent 680ba7ca630f5816af9c80a946520be76b2167a5
author Linus Torvalds <torvalds@linux-foundation.org> 1311020966 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1311020966 -0700

Merge git://git.kernel.org/pub/scm/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