summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-05 14:32:21 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-05 14:32:21 (GMT)
commited7dc1dfbcef301407a1e3138a49dc94e5a19d0a (patch)
tree2aef7400d404774f0f8a30b6eefb0690a09ec24c /init
parent7926e0bfbbc5ff81ddad0fda831eef7060e40997 (diff)
parentca7335948e294faf8adf65f2c95ca18ea78540db (diff)
downloadlinux-ed7dc1dfbcef301407a1e3138a49dc94e5a19d0a.tar.xz
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: (30 commits) X25: remove duplicated #include tcp: use correct net ns in cookie_v4_check() rps: tcp: fix rps_sock_flow_table table updates ppp_generic: fix multilink fragment sizes syncookies: remove Kconfig text line about disabled-by-default ixgbe: only check pfc bits in hang logic if pfc is enabled net: check for refcount if pop a stacked dst_entry ixgbe: return IXGBE_ERR_RAR_INDEX when out of range act_pedit: access skb->data safely sfc: Store port number in net_device::dev_id epic100: Test __BIG_ENDIAN instead of (non-existent) CONFIG_BIG_ENDIAN tehuti: return -EFAULT on copy_to_user errors isdn/kcapi: return -EFAULT on copy_from_user errors e1000e: change logical negate to bitwise sfc: Get port number from CS_PORT_NUM, not PCI function number cls_u32: use skb_header_pointer() to dereference data safely TCP: tcp_hybla: Fix integer overflow in slow start increment act_nat: fix the wrong checksum when addr isn't in old_addr/mask net/fec: fix pm to survive to suspend/resume korina: count RX DMA OVR as rx_fifo_error ...
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions