index
:
net-next.git
emaclite-cleanup
master
nds-private-remove
packet-loop-back
packet-rx-pump-back
net-next plumbings
Tobias Klauser
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
drivers
/
usb
/
phy
/
phy-am335x-control.c
diff options
context:
1
2
3
4
5
6
7
8
9
10
15
20
25
30
35
40
space:
include
ignore
mode:
unified
ssdiff
stat only
Diffstat
(limited to 'drivers/usb/phy/phy-am335x-control.c')
0 files changed, 0 insertions, 0 deletions
ac0545e5184c1c47b (
patch
) tree
f4abe2f05e173023d2a262afd4aebb1e89fe6985
/
include/dt-bindings/clock/hi3519-clock.h
parent
76e0e70e6452b971a69cc9794ff4a6715c11f7f2
(
diff
)parent
926af6273fc683cd98cd0ce7bf0d04a02eed6742
(
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 'include/dt-bindings/clock/hi3519-clock.h')