Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 May 2008 00:08:21 +0000 (17:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 May 2008 00:08:21 +0000 (17:08 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: IDE_HFLAG_SERIALIZE_DMA bugfix


Trivial merge