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)
This commit is contained in:
Linus Torvalds 2008-09-10 14:16:53 -07:00
commit 9a0e4c8038
2 changed files with 23 additions and 16 deletions