summaryrefslogtreecommitdiff
path: root/net/x25
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-12-07 15:15:33 +0400
committerIngo Molnar <mingo@kernel.org>2012-12-07 15:15:33 +0400
commit222e82bef4bd520a31d48c31ab24e49dd46daa46 (patch)
treeb6e73cad8e0b3a1c3e1acc537789e97aadaefa92 /net/x25
parent38ca9c927c7d3db61f57e3d3a9334958c3af6e9a (diff)
parent18a2f371f5edf41810f6469cb9be39931ef9deb9 (diff)
downloadlinux-222e82bef4bd520a31d48c31ab24e49dd46daa46.tar.xz
Merge branch 'linus' into sched/core
Pick up the autogroups fix and other fixes. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/x25')
0 files changed, 0 insertions, 0 deletions