Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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>
No related branches found
No related tags found
Showing
- drivers/isdn/hardware/avm/Kconfig 2 additions, 1 deletiondrivers/isdn/hardware/avm/Kconfig
- include/linux/if_ether.h 1 addition, 1 deletioninclude/linux/if_ether.h
- include/linux/if_fddi.h 4 additions, 4 deletionsinclude/linux/if_fddi.h
- include/linux/if_hippi.h 4 additions, 4 deletionsinclude/linux/if_hippi.h
- include/linux/if_pppox.h 5 additions, 5 deletionsinclude/linux/if_pppox.h
- include/linux/ipv6.h 2 additions, 2 deletionsinclude/linux/ipv6.h
- include/linux/nbd.h 1 addition, 1 deletioninclude/linux/nbd.h
- include/linux/ncp.h 5 additions, 5 deletionsinclude/linux/ncp.h
- include/linux/netfilter/xt_IDLETIMER.h 1 addition, 1 deletioninclude/linux/netfilter/xt_IDLETIMER.h
- include/linux/phonet.h 2 additions, 2 deletionsinclude/linux/phonet.h
- include/linux/rfkill.h 1 addition, 1 deletioninclude/linux/rfkill.h
Loading
Please register or sign in to comment