projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05bf86b 5f6f12c)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 May 2011 19:19:18 +0000 (12:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 May 2011 19:19:18 +0000 (12:19 -0700)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: fix oops when LPM is used with PMP


Trivial merge
John Crispins staging tree