"real" fixes, and checkpatch fixes.
Please pull from 'upstream-linus' branch of

master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
 drivers/ata/ahci.c              |   17 ++---

 drivers/ata/libata-core.c       |  146 +++++++++++++++++++++++---------

 drivers/ata/libata-eh.c         |   25 +++++-

 drivers/ata/libata-scsi.c       |   23 -----

 drivers/ata/pata_acpi.c         |    4 +-

 drivers/ata/pata_ns87415.c      |    2 +

 drivers/ata/pata_optidma.c      |    2 +-

 drivers/ata/pata_pcmcia.c       |   12 ++--

 drivers/ata/pata_pdc2027x.c     |    2 +-

 drivers/ata/pata_pdc202xx_old.c |    4 +-

 drivers/ata/pata_scc.c          |   13 +---

 drivers/ata/pata_via.c          |    2 +-

 drivers/ata/pata_winbond.c      |    2 +-

 drivers/ata/pdc_adma.c          |   12 ++--

 drivers/ata/sata_inic162x.c     |    4 +-

 drivers/ata/sata_mv.c           |    7 +-

 drivers/ata/sata_nv.c           |  120 ++++++++++++++------------

 drivers/ata/sata_promise.c      |   38 +++++----

 drivers/ata/sata_qstor.c        |    3 +-

 drivers/ata/sata_sil.c          |   11 ++-

 drivers/ata/sata_sil24.c        |    9 +-

 drivers/ata/sata_sis.c          |   64 ++++++++-------

 drivers/ata/sata_svw.c          |   10 +-

 drivers/ata/sata_sx4.c          |  177 ++++++++++++++++++++-------------------

 drivers/ata/sata_uli.c          |   18 ++--

 drivers/ata/sata_via.c          |   20 ++--

 drivers/ata/sata_vsc.c          |   15 ++--

 include/linux/ata.h             |    1 +

 include/linux/libata.h          |    9 ++

 29 files changed, 432 insertions(+), 340 deletions(-)
Frank Lichtenheld (1):

      pata_ns87415: define SUPERIO_IDE_MAX_RETRIES
Jeff Garzik (4):

      [libata] fix 'if(' and similar areas that lack whitespace

      [libata] Address some checkpatch-spotted issues

      [libata] sata_nv: fix SWNCQ enabling

      [libata] AHCI: fix newly introduced host-reset bug
Tejun Heo (6):

      libata: relocate and fix post-co...
[ message continues ]

NOTE: This is on top of the 'upstream-linus' branch, in a linear

history.  If you pull this, you get BOTH this and upstream-linus.  If

you already pulled upstream-linus, you will get only what you see below.
This has been in -mm for a while, but didn't make the initial push due

to my own fault.
Hardware SATA link power management (ALPM) has a __significant__

positive impact on power saving.  At the min_power setting (maximize

power savings), there have been claimed of battery life being extended

by 30-60 minutes or more (on a 4-6 hour battery).
Please pull from 'alpm' branch of

master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git alpm
to receive the following updates:
 .../scsi/link_power_management_policy.txt          |   19 ++

 drivers/ata/ahci.c                                 |  157 ++++++++++++++++-

 drivers/ata/libata-core.c                          |  196 +++++++++++++++++++-

 drivers/ata/libata-eh.c                            |    4 +

 drivers/ata/libata-scsi.c                          |   68 +++++++

 drivers/ata/libata.h                               |    2 +

 include/linux/ata.h                                |   21 ++

 include/linux/libata.h                             |   21 ++-

 8 files changed, 484 insertions(+), 4 deletions(-)

 create mode 100644 Documentation/scsi/link_power_management_policy.txt
Kristen Carlson Accardi (2):

      [libata] Link power management infrastructure

      [libata] AHCI: add hw link power management support
diff --git a/Documentation/scsi/link_power_management_policy.txt b/Documentation/scsi/link_power_management_policy.txt

new file mode 100644

index 0000000..d18993d

--- /dev/null

+++ b/Documentation/scsi/link_power_management_policy.txt

@@ -0,0 +1,19 @@

+This parameter allows the user to set the link (interface) power management.

+There are 3 possible options:

+

+Value			Effect

+----------------------------------------------------------------------------

+min_power		Tell the controller to try to make the l...
[ message continues ]