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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_mv: remove pointless NULL test
  pata_hpt3x2n: fix clock turnaround
  libata: fix reporting of drained bytes when clearing DRQ
  sata_mv: add power management support for the PCI controllers.
  sata_mv: store the board_idx into the host private data
  pata_octeon_cf: use resource_size(), to fix resource sizing bug
  libata: use the WRITE_SAME_16 define
  sata_mv: move the PCI bar description initialization code
  sata_mv: add power management support for the platform driver
  sata_mv: support clkdev framework
  sata_mv: increase PIO IORDY timeout

Fixed crazy mode-change in merge.

diff --cc drivers/ata/sata_mv.c
index a8a7be0d06ffcf895f39b96fc966f68ae18b6bf6,df8ee325d3ca3869c1fb6609a3432d590178d8c7..df8ee325d3ca3869c1fb6609a3432d590178d8c7
mode 100644,100755..100644
--- 1/drivers/ata/sata_mv.c
--- 2/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c