| commit | 00dd7b7d26a3bf3780cfcebfdde2b86126b3a082 | [log] [tgz] |
|---|---|---|
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | Sun Aug 06 12:42:33 2006 -0500 |
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | Sun Aug 06 12:42:33 2006 -0500 |
| tree | 5129fd1abc99d0c58a520938f28bf330ae94ef30 | |
| parent | 58b3ac07fed31ffc1349380b78305af6522fe1f4 [diff] | |
| parent | 6e1e63259b1e01f047796e7985d960ca040993e6 [diff] |
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>