diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-08 20:41:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-08 20:41:10 +0200 |
| commit | 69849375d6b13e94d08cdc94b49b11fbab454a0e (patch) | |
| tree | b207e157d9c82b6d328275c1c7d921ef4a584caf /block/scsi_ioctl.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [MIPS] Sibyte: Register PIO PATA device only for Swarm and Litte Sur (diff) | |
| download | linux-69849375d6b13e94d08cdc94b49b11fbab454a0e.tar.xz linux-69849375d6b13e94d08cdc94b49b11fbab454a0e.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Sibyte: Register PIO PATA device only for Swarm and Litte Sur
Diffstat (limited to 'block/scsi_ioctl.c')
0 files changed, 0 insertions, 0 deletions