Skip to content
Commit 00dd7b7d authored by James Bottomley's avatar James Bottomley
Browse files

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: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parents 58b3ac07 6e1e6325
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment