Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 May 2009 19:47:11 +0000 (12:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 May 2009 19:47:11 +0000 (12:47 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  piix: The Sony TZ90 needs the cable type hardcoding
  icside: register second channel of version 6 PCB
  ide-tape: remove back-to-back REQUEST_SENSE detection


Trivial merge