Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Dec 2009 18:13:37 +0000 (10:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Dec 2009 18:13:37 +0000 (10:13 -0800)
commitf7b84a6ba7eaeba4e1df8feddca1473a7db369a5
treebb63aaaff81661672cd0521da206261d80bc4bb0
parent292be57e152ef6881089a62298c6ec885ed46f0e
parent509426bd46ad0903dca409803e0ee3d30f99f1e8
Merge branch 'upstream-linus' of git://git./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"