From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Dec 2010 21:00:16 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v3.12-rc1~7907
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dfe80f63293ece364795c2e87805882c9ec3a266;p=kernel%2Fkernel-generic.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:
  libata: issue DIPM enable commands with LPM state updated
  libata: no special completion processing for EH commands
  pata_mpc52xx: driver needs BMDMA
  pata_cs5536: Add support for non-X86_32 platforms
  libata-sff: fix HSM_ST_ERR handling in __ata_sff_port_intr()
---

dfe80f63293ece364795c2e87805882c9ec3a266