| commit | 2b858bd02ffca71391161f5709588fc70da79531 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Apr 19 17:25:28 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Apr 19 17:25:28 2007 -0700 |
| tree | 5652cdcc7c5307d4ebf2eb029e542b731a7243e5 | |
| parent | 93cd791e02bbdb504aba024a14fdc07fe246bc71 [diff] | |
| parent | f3769e9db11df38c211881a5f11b2e38a8e4477a [diff] |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: pata_sis: Fix oops on boot