![]() Conflicts: include/linux/if_pppox.h Fix conflict between Changli's __packed header file fixes and the new PPTP driver. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
avm | ||
eicon | ||
mISDN | ||
Kconfig | ||
Makefile |
![]() Conflicts: include/linux/if_pppox.h Fix conflict between Changli's __packed header file fixes and the new PPTP driver. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
avm | ||
eicon | ||
mISDN | ||
Kconfig | ||
Makefile |