projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ff3421d ff7f3ef)
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Apr 2013 15:17:09 +0000 (08:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Apr 2013 15:17:09 +0000 (08:17 -0700)
commit3658f3604066d5500ebd73a04084f127dc779441
treeaa4a607815914d99374cbee4e2db53c83070da32tree | snapshot
parentff3421dee60928de95b68a13a1b64125b62b10a4commit | diff
parentff7f3efb9abf986f4ecd8793a9593f7ca4d6431acommit | diff
Merge branch 'stable' of git://git./linux/kernel/git/cmetcalf/linux-tile

Pull arch/tile fix from Chris Metcalf:
 "This change allows newer Tilera boot tools to work correctly with
  current (and stable) kernels by using the right filename to get the
  initramfs from the Tilera hypervisor filesystem."

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: expect new initramfs name from hypervisor file system
John Crispins staging tree