mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-25 10:59:05 +00:00
1459143386
Conflicts: drivers/net/ieee802154/fakehard.c A bug fix went into 'net' for ieee802154/fakehard.c, which is removed in 'net-next'. Add build fix into the merge from Stephen Rothwell in openvswitch, the logging macros take a new initial 'log' argument, a new call was added in 'net' so when we merge that in here we have to explicitly add the new 'log' arg to it else the build fails. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
c_can | ||
cc770 | ||
m_can | ||
mscan | ||
sja1000 | ||
softing | ||
spi | ||
usb | ||
at91_can.c | ||
bfin_can.c | ||
dev.c | ||
flexcan.c | ||
grcan.c | ||
janz-ican3.c | ||
Kconfig | ||
led.c | ||
Makefile | ||
pch_can.c | ||
rcar_can.c | ||
slcan.c | ||
ti_hecc.c | ||
vcan.c | ||
xilinx_can.c |