renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 06:34:11 +08:00
Code
4c1ac1b491
linux-next/net/ipv4/ipvs
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
ip_vs_app.c [IPVS]: Use kmemdup where appropriate 2006-12-02 21:30:16 -08:00
ip_vs_conn.c [IPVS]: ipvs annotations 2006-09-28 18:03:04 -07:00
ip_vs_core.c [NET]: Annotate ip_vs_checksum_complete() and callers. 2006-12-02 21:23:37 -08:00
ip_vs_ctl.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
ip_vs_dh.c [IPVS]: ipvs annotations 2006-09-28 18:03:04 -07:00
ip_vs_est.c [NET]: Conversions from kmalloc+memset to k(z|c)alloc. 2006-07-21 14:51:30 -07:00
ip_vs_ftp.c [IPVS]: More endianness fixed. 2006-11-10 14:57:37 -08:00
ip_vs_lblc.c [IPVS]: ipvs annotations 2006-09-28 18:03:04 -07:00
ip_vs_lblcr.c [IPVS]: ipvs annotations 2006-09-28 18:03:04 -07:00
ip_vs_lc.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ip_vs_nq.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ip_vs_proto_ah.c [INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h 2006-01-03 13:11:21 -08:00
ip_vs_proto_esp.c [INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h 2006-01-03 13:11:21 -08:00
ip_vs_proto_tcp.c [NET]: ipvs checksum annotations. 2006-12-02 21:23:41 -08:00
ip_vs_proto_udp.c [NET]: ipvs checksum annotations. 2006-12-02 21:23:41 -08:00
ip_vs_proto.c [IPVS]: Use kmemdup where appropriate 2006-12-02 21:30:16 -08:00
ip_vs_rr.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ip_vs_sched.c [IPVS]: Fix compilation 2006-01-05 12:14:43 -08:00
ip_vs_sed.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ip_vs_sh.c [IPVS]: ipvs annotations 2006-09-28 18:03:04 -07:00
ip_vs_sync.c [PATCH] completions: lockdep annotate on stack completions 2006-10-01 00:39:24 -07:00
ip_vs_wlc.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ip_vs_wrr.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ip_vs_xmit.c [IPVS]: ipvs annotations 2006-09-28 18:03:04 -07:00
Kconfig Still more typo fixes 2006-10-03 22:36:44 +02:00
Makefile [IPVS]: remove net/ipv4/ipvs/ip_vs_proto_icmp.c 2005-06-02 13:02:25 -07:00