From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 May 2009 19:47:11 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b41a080fa9f157d223c782ec3571cf46e34e91d6;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git./linux/kernel/git/bart/ide-2.6

* '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
---

b41a080fa9f157d223c782ec3571cf46e34e91d6