diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:25:50 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:25:50 -0400 |
| commit | a64f97f2c351410dfb3099c2369eacf7154b5532 (patch) | |
| tree | b9f132ee5544febc50a9616a4edb52dd89370105 /scripts/patch-kernel | |
| parent | Merge branch 'master' into upstream (diff) | |
| parent | Fix libata resource conflict for legacy mode (diff) | |
| download | linux-a64f97f2c351410dfb3099c2369eacf7154b5532.tar.gz linux-a64f97f2c351410dfb3099c2369eacf7154b5532.zip | |
Merge branch 'tmp' into upstream
Conflicts:
drivers/ata/libata-sff.c
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions