From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Sep 2008 21:16:53 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a0e4c8038390342f48e574b157a1971e2f07348;p=linux-2.6

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)
---

9a0e4c8038390342f48e574b157a1971e2f07348