projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58b3ac0 6e1e632)
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)
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>

Trivial merge
John Crispins staging tree