| commit | 3a5c3743f15f27237ab025736a981e2d0c9fdfed | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 18 Jul 2011 20:29:26 +0000 (18 13:29 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 18 Jul 2011 20:29:26 +0000 (18 13:29 -0700) | ||
| tree | 13fc4d89901c2e2e187cfb44ab904bc587b0ab9c | treesnapshot (tar.gz zip) |
| parent | dc6b845044ccb7e9e6f3b7e71bd179b3cf0223b6 | commitdiff |
| parent | 680ba7ca630f5816af9c80a946520be76b2167a5 | commitdiff |
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
* 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