[colors] # These were the old defaults top = red, lightgray medium = green, lightgray normal = black, lightgray selected = lightgray, magenta jump_arrows = blue, lightgray addr = magenta, lightgray [tui] # Defaults if linked with libslang report = on annotate = on top = on [buildid] # Default, disable using /dev/null dir = /root/.debug [annotate] # Defaults hide_src_code = false use_offset = true jump_arrows = true show_nr_jumps = false [report] # Defaults sort-order = comm,dso,symbol percent-limit = 0 queue-size = 0 children = true group = true 'logo' rowspan='2'>cgit logo index : net-next.git
net-next plumbingsTobias Klauser
summaryrefslogtreecommitdiff
path: root/net/bluetooth/rfcomm/tty.c
AgeCommit message (Expand)AuthorFilesLines
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch)
treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/openvswitch/vport.h
parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)
parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (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 'net/openvswitch/vport.h')