Merge branch 'gcc4'

author Willy Tarreau <w@1wt.eu>

Sun, 17 Sep 2006 22:08:09 +0000 (00:08 +0200)

committer Willy Tarreau <w@1wt.eu>

Sun, 17 Sep 2006 22:08:09 +0000 (00:08 +0200)
author Willy Tarreau <w@1wt.eu>
Sun, 17 Sep 2006 22:08:09 +0000 (00:08 +0200)
committer Willy Tarreau <w@1wt.eu>
Sun, 17 Sep 2006 22:08:09 +0000 (00:08 +0200)
diff --cc Makefile
Simple merge
diff --cc include/linux/usb.h
Simple merge
author	Willy Tarreau <w@1wt.eu>
	Sun, 17 Sep 2006 22:08:09 +0000 (00:08 +0200)
committer	Willy Tarreau <w@1wt.eu>
	Sun, 17 Sep 2006 22:08:09 +0000 (00:08 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/usb.h	patch \|	diff1 \|	diff2 \|	blob \| history