tree 9f177b1855dc32fde402022fe86b896946a78fce
parent 49b2de8e6febfea5a8791b6476195903af83a35d
parent 9bd7496f5dd488e109e91d9d5743915fb4dfbfde
author Linus Torvalds <torvalds@linux-foundation.org> 1256833354 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1256833354 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  ide: Serialize CMD643 and CMD646 to fix a hardware bug with SSD