]> git.baikalelectronics.ru Git - kernel.git/commit
Merge ../linux-2.6
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>
Sun, 6 Aug 2006 17:42:33 +0000 (12:42 -0500)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Sun, 6 Aug 2006 17:42:33 +0000 (12:42 -0500)
commit02bf964ff2d4a081353803666372d50abf6288a5
tree5129fd1abc99d0c58a520938f28bf330ae94ef30
parentbf4c7018ba7caeb237faa096e6bcefe7f69db5db
parentff947589b750974e2b9e3ce8749ad1a143fccace
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>