linux/drivers/net/ppp, branch v3.2Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/
https://git.shady.money/linux/atom?h=v3.22011-12-07T18:29:04Zppp: fix pptp double release_sock in pptp_bind()2011-12-07T18:29:04ZDjalal Harounitixxdz@opendz.org2011-12-06T15:47:12Zurn:sha1:a454daceb78844a09c08b6e2d8badcb76a5d73b9
Signed-off-by: Djalal Harouni <tixxdz@opendz.org>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net2011-10-24T22:18:09ZDavid S. Millerdavem@davemloft.net2011-10-24T22:18:09Zurn:sha1:1805b2f04855f07afe3a71d620a68f483b0ed74fMerge branch 'master' of github.com:davem330/net2011-09-22T07:23:13ZDavid S. Millerdavem@davemloft.net2011-09-22T07:23:13Zurn:sha1:8decf868790b48a727d7e7ca164f2bcd3c1389c0
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
ppp: Move the PPP drivers2011-08-27T07:58:26ZJeff Kirsherjeffrey.t.kirsher@intel.com2011-07-31T09:38:19Zurn:sha1:224cf5ad14c038b13c119dff29422f178a306f54
Move the PPP drivers into drivers/net/ppp/ and make the
necessary Kconfig and Makefile changes.
CC: Paul Mackerras <paulus@samba.org>
CC: Frank Cusack <fcusack@fcusack.com>
CC: Michal Ostrowski <mostrows@speakeasy.net>
CC: Michal Ostrowski <mostrows@earthlink.net>
CC: Dmitry Kozlov <xeb@mail.ru>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>