diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 19:42:33 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 19:42:33 +0200 |
| commit | 00dd7b7d26a3bf3780cfcebfdde2b86126b3a082 (patch) | |
| tree | 5129fd1abc99d0c58a520938f28bf330ae94ef30 /crypto | |
| parent | [SCSI] zfcp: bump version number (diff) | |
| parent | Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/... (diff) | |
| download | linux-00dd7b7d26a3bf3780cfcebfdde2b86126b3a082.tar.xz linux-00dd7b7d26a3bf3780cfcebfdde2b86126b3a082.zip | |
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>
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions