diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 13:29:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 13:29:26 -0700 |
commit | 3a5c3743f15f27237ab025736a981e2d0c9fdfed (patch) | |
tree | 13fc4d89901c2e2e187cfb44ab904bc587b0ab9c /arch/x86/include/asm | |
parent | dc6b845044ccb7e9e6f3b7e71bd179b3cf0223b6 (diff) | |
parent | 680ba7ca630f5816af9c80a946520be76b2167a5 (diff) |
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
Diffstat (limited to 'arch/x86/include/asm')
0 files changed, 0 insertions, 0 deletions