| commit | 9a0e4c8038390342f48e574b157a1971e2f07348 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 10 14:16:53 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 10 14:16:53 2008 -0700 |
| tree | 71eedd9a4a332b1eb3180d4b13f71bb8955c0a29 | |
| parent | 9e7222c83560186686319f2892f43fc557baed2d [diff] | |
| parent | 46dfa040f6c26f416a0979a7cd5a2d81f08121d5 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: add deprecated ide-scsi to feature-removal-schedule.txt ide: Fix pointer arithmetic in hpt3xx driver code (3rd try)