From: Linus Torvalds Date: Mon, 21 Dec 2009 18:13:37 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f7b84a6ba7eaeba4e1df8feddca1473a7db369a5;p=linux.git 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" --- f7b84a6ba7eaeba4e1df8feddca1473a7db369a5