James Bottomley 00dd7b7d26 Merge ../linux-2.6 ... Conflicts: arch/ia64/hp/sim/simscsi.c Stylistic differences in two separate fixes for buffer->request_buffer problem. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>		2006-08-06 12:42:33 -05:00
..
core	IB/uverbs: Avoid a crash on device hot remove	2006-08-03 10:56:42 -07:00
hw	IB/mthca: Clean up mthca array index mask	2006-08-03 09:44:22 -07:00
ulp	Merge ../linux-2.6	2006-08-06 12:42:33 -05:00
Kconfig	IB/iser: iSER Kconfig and Makefile	2006-06-22 07:51:14 -07:00
Makefile	IB/iser: iSER Kconfig and Makefile	2006-06-22 07:51:14 -07:00