summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-01 08:17:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-01 08:17:09 -0700
commit3658f3604066d5500ebd73a04084f127dc779441 (patch)
treeaa4a607815914d99374cbee4e2db53c83070da32 /net/sched
parentff3421dee60928de95b68a13a1b64125b62b10a4 (diff)
parentff7f3efb9abf986f4ecd8793a9593f7ca4d6431a (diff)
downloadlinux-3658f3604066d5500ebd73a04084f127dc779441.tar.bz2
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/sched')
0 files changed, 0 insertions, 0 deletions