diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-02 15:23:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-02 15:23:08 -0700 |
| commit | 59117d3f4e3f5a7980353d2f476e516c758ce921 (patch) | |
| tree | dbc12a55f0e1c46205acbc88bda35b96ad4b1269 /block/blktrace.c | |
| parent | 856fc004b82ae31846b3037558ec1b2a6286e629 (diff) | |
| parent | 8cc574a3c5cea70229f243a6b57fd69e60491d82 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SCSI]: Fix scsi_send_eh_cmnd scatterlist handling
[SPARC]: Add unsigned to unused bit field in a.out.h
Diffstat (limited to 'block/blktrace.c')
0 files changed, 0 insertions, 0 deletions