git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 9e7222c 46dfa04)
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)
* 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)


Trivial merge
Pandora Kernel Repository