summaryrefslogtreecommitdiff
path: root/cpusched.c
diff options
context:
space:
mode:
authorVadim Kochan <vadim4j@gmail.com>2016-08-13 02:11:23 +0300
committerTobias Klauser <tklauser@distanz.ch>2016-09-21 09:59:23 +0200
commit77f4dfb3c3b31a66cfa70512a7bd42ce9cf74d19 (patch)
treef2c356a7968a53581eba5ed6e81f0b692b53ff78 /cpusched.c
parent249891474f6820ab1d829601188b5e3ce82c5f0f (diff)
trafgen: man: Add description for 'dinc' and 'drnd' field functions
Add explanation about 'drnd' and 'dinc' functions which might be used for proto field functions. Signed-off-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'cpusched.c')
0 files changed, 0 insertions, 0 deletions
83cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/arch/arm/tests/dwarf-unwind.c')