From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Apr 2009 19:07:25 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: firefly_0821_release~14417
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=df89f1ba971b3df2b7e1bc46ca7ce867539186fa;p=firefly-linux-kernel-4.4.55.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:
  cs5536: define dma_sff_read_status() method
  ide: fix barriers support
  ide: Remove void casts
  hpt366: use ATA_DMA_* constants
  hpt366: fix HPT370 DMA timeouts
---

df89f1ba971b3df2b7e1bc46ca7ce867539186fa