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 6ed911fb04 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 ... * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (40 commits) bonding/bond_main.c: make 2 functions static ps3: gigabit ethernet driver for PS3, take3 [netdrvr] Fix dependencies for ax88796 ne2k clone driver eHEA: Capability flag for DLPAR support Remove sk98lin ethernet driver. sunhme.c:quattro_pci_find() must be __devinit bonding / ipv6: no addrconf for slaves separately from master atl1: remove write-only var in tx handler macmace: use "unsigned long flags;" Cleanup usbnet_probe() return value handling netxen: deinline and sparse fix eeprom_93cx6: shorten pulse timing to match spec (bis) phylib: Add Marvell 88E1112 phy id phylib: cleanup marvell.c a bit AX88796 network driver IOC3: Switch to pci refcounting safe APIs e100: Fix Tyan motherboard e100 not receiving IPMI commands QE Ethernet driver writes to wrong register to mask interrupts rrunner.c:rr_init() must be __devinit tokenring/3c359.c:xl_init() must be __devinit ...		18 years ago
..
802	…
8021q	[NET]: Fix comparisons of unsigned < 0.	18 years ago
appletalk	header cleaning: don't include smp_lock.h when not used	18 years ago
atm	…
ax25	[S390] Kconfig: unwanted menus for s390.	18 years ago
bluetooth	Fix use-after-free oops in Bluetooth HID.	18 years ago
bridge	[BRIDGE]: Round off STP perodic timers.	18 years ago
core	[NETPOLL]: Fixups for 'fix soft lockup when removing module'	18 years ago
dccp	[NET]: Fix comparisons of unsigned < 0.	18 years ago
decnet	[NETLINK]: Mark netlink policies const	18 years ago
econet	…
ethernet	…
ieee80211	[PATCH] softmac: use list_for_each_entry	18 years ago
ipv4	[TCP] tcp_read_sock: Allow recv_actor() return return negative error value.	18 years ago
ipv6	bonding / ipv6: no addrconf for slaves separately from master	18 years ago
ipx	Fix incorrect prototype for ipxrtr_route_packet()	18 years ago
irda	[IrDA]: f-timer reloading when sending rejected frames.	18 years ago
iucv	Add suspend-related notifications for CPU hotplug	18 years ago
key	xfrm: Add security check before flushing SAD/SPD	18 years ago
lapb	…
llc	Fix occurrences of "the the "	18 years ago
mac80211	[PATCH] mac80211: Don't stop tx queue on master device while scanning.	18 years ago
netfilter	[NETFILTER]: nf_conntrack_h323: add checking of out-of-range on choices' index values	18 years ago
netlabel	[NetLabel]: consolidate the struct socket/sock handling to just struct sock	18 years ago
netlink	[NETLINK]: Mark netlink policies const	18 years ago
netrom	…
packet	[AF_PACKET]: Kill CONFIG_PACKET_SOCKET.	18 years ago
rfkill	[RFKILL]: Fix check for correct rfkill allocation	18 years ago
rose	…
rxrpc	[AF_RXRPC]: Return the number of bytes buffered in rxrpc_send_data()	18 years ago
sched	[NET_SCHED]: Fix filter double free	18 years ago
sctp	SCTP: Add scope_id validation for link-local binds	18 years ago
sunrpc	sendfile: convert nfsd to splice_direct_to_actor()	18 years ago
tipc	[TIPC]: Fix infinite loop in netlink handler	18 years ago
unix	[AF_UNIX]: Fix stream recvmsg() race.	18 years ago
wanrouter	[NET]: Fix comparisons of unsigned < 0.	18 years ago
wireless	[PATCH] cfg80211: fix signed macaddress in sysfs	18 years ago
x25	header cleaning: don't include smp_lock.h when not used	18 years ago
xfrm	[XFRM]: Fix MTU calculation for non-ESP SAs	18 years ago
Kconfig	[S390] Kconfig: no wireless on s390.	18 years ago
Makefile	…
TUNABLE	…
compat.c	…
nonet.c	…
socket.c	Remove SLAB_CTOR_CONSTRUCTOR	18 years ago
sysctl_net.c	…