You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 5f05647dd8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits) bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL. vlan: Calling vlan_hwaccel_do_receive() is always valid. tproxy: use the interface primary IP address as a default value for --on-ip tproxy: added IPv6 support to the socket match cxgb3: function namespace cleanup tproxy: added IPv6 support to the TPROXY target tproxy: added IPv6 socket lookup function to nf_tproxy_core be2net: Changes to use only priority codes allowed by f/w tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled tproxy: added tproxy sockopt interface in the IPV6 layer tproxy: added udp6_lib_lookup function tproxy: added const specifiers to udp lookup functions tproxy: split off ipv6 defragmentation to a separate module l2tp: small cleanup nf_nat: restrict ICMP translation for embedded header can: mcp251x: fix generation of error frames can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set can-raw: add msg_flags to distinguish local traffic 9p: client code cleanup rds: make local functions/variables static ... Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and drivers/net/wireless/ath/ath9k/debug.c as per David		15 years ago
..
acpi	…
asm-generic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	15 years ago
crypto	…
drm	…
keys	…
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	15 years ago
math-emu	…
media	…
mtd	…
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	15 years ago
pcmcia	pcmcia: IOCARD is also required for using IRQs	15 years ago
rdma	…
rxrpc	…
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	15 years ago
sound	driver core: remove CONFIG_SYSFS_DEPRECATED_V2 but keep it for block devices	15 years ago
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	15 years ago
video	…
xen	…
Kbuild	…