tree bb63aaaff81661672cd0521da206261d80bc4bb0
parent 292be57e152ef6881089a62298c6ec885ed46f0e
parent 509426bd46ad0903dca409803e0ee3d30f99f1e8
author Linus Torvalds <torvalds@linux-foundation.org> 1261419217 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1261419217 -0800

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_cmd64x: fix overclocking of UDMA0-2 modes
  Revert "pata_cmd64x: implement serialization as per notes"