projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9272f2d aeba373)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Oct 2014 21:22:32 +0000 (14:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Oct 2014 21:22:32 +0000 (14:22 -0700)
commit168f07a1ea75870b3fdee3d69d978813eb1fd58d
tree7d341320d205de3227849e20737537972def1f91tree | snapshot
parent9272f2dc3956c6b6c4335de51bc897fa3b981584commit | diff
parentaeba3731b150188685225b510886f1370d8814decommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/mpe/linux

Pull powerpc fix from Michael Ellerman:
 "There was a bit of a misunderstanding between us and the ARM guys in
  the device tree PCI code, which is breaking virtio on powerpc.

  This is the minimal fix until we can sort it out properly"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc/pci: Fix IO space breakage after of_pci_range_to_resource() change
John Crispins staging tree