diff options
| author | Linus Torvalds <[email protected]> | 2013-04-01 15:17:09 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2013-04-01 15:17:09 +0000 |
| commit | 3658f3604066d5500ebd73a04084f127dc779441 (patch) | |
| tree | aa4a607815914d99374cbee4e2db53c83070da32 /net/unix/af_unix.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | tile: expect new initramfs name from hypervisor file system (diff) | |
| download | kernel-3658f3604066d5500ebd73a04084f127dc779441.tar.gz kernel-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/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions