OSDN Git Service

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Sep 2008 21:16:53 +0000 (14:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Sep 2008 21:16:53 +0000 (14:16 -0700)
commit9a0e4c8038390342f48e574b157a1971e2f07348
tree71eedd9a4a332b1eb3180d4b13f71bb8955c0a29
parent9e7222c83560186686319f2892f43fc557baed2d
parent46dfa040f6c26f416a0979a7cd5a2d81f08121d5
Merge git://git./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)