From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 May 2011 19:19:18 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9f6bd36c407f30c388c5de66c831e1968eec0367;p=openwrt%2Fstaging%2Fblogic.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: fix oops when LPM is used with PMP
---

9f6bd36c407f30c388c5de66c831e1968eec0367