summaryrefslogtreecommitdiff
path: root/staging/cli_dns.c
diff options
context:
space:
mode:
Diffstat (limited to 'staging/cli_dns.c')
0 files changed, 0 insertions, 0 deletions
e30f2cf6ba588e6a4092275c&id2=c172d82500a6cf3c32d1e650722a1055d72ce858'>diff)parente3bbfa78bab125f58b831b5f7f45b5a305091d72 (diff)
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply pending patches that are based on newer code already present upstream.
Diffstat (limited to 'Documentation/scheduler')