From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 19 Dec 2009 19:04:29 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=70e66a5079b2b33f142303d31581cf03f7af98fe;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.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:
  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.
---

70e66a5079b2b33f142303d31581cf03f7af98fe
diff --cc drivers/ata/sata_mv.c
index a8a7be0d06ff,df8ee325d3ca..df8ee325d3ca
mode 100644,100755..100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c