aboutsummaryrefslogtreecommitdiff
path: root/include/asm-i386
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-29 11:29:33 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-29 11:29:33 -0800
commitf3cab8a0b1a772dc8b055b7affa567a366627c9e (patch)
tree39c4736047e7f1f6617a4703b3ebf62df1d68d34 /include/asm-i386
parent76babde121d2ffef04ca692ce64ef9f8a9866086 (diff)
parent65b4b4e81a5094d52cbe372b887b1779abe53f9b (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NETFILTER]: Rename init functions. [TCP]: Fix RFC2465 typo. [INET]: Introduce tunnel4/tunnel6 [NET]: deinline 200+ byte inlines in sock.h [ECONET]: Convert away from SOCKOPS_WRAPPED [NET]: Fix ipx/econet/appletalk/irda ioctl crashes [NET]: Kill Documentation/networking/TODO [TG3]: Update version and reldate [TG3]: Skip timer code during full lock [TG3]: Speed up SRAM access [TG3]: Fix PHY loopback on 5700 [TG3]: Fix bug in 40-bit DMA workaround code [TG3]: Fix probe failure due to invalid MAC address
Diffstat (limited to 'include/asm-i386')
0 files changed, 0 insertions, 0 deletions