diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-01 08:17:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-01 08:17:09 -0700 |
| commit | 3658f3604066d5500ebd73a04084f127dc779441 (patch) | |
| tree | aa4a607815914d99374cbee4e2db53c83070da32 /net/xfrm | |
| parent | ff3421dee60928de95b68a13a1b64125b62b10a4 (diff) | |
| parent | ff7f3efb9abf986f4ecd8793a9593f7ca4d6431a (diff) | |
| download | blackbird-op-linux-3658f3604066d5500ebd73a04084f127dc779441.tar.gz blackbird-op-linux-3658f3604066d5500ebd73a04084f127dc779441.zip | |
Merge branch 'stable' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions
