David S. Miller 2d4833aae6 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>		2010-08-22 22:37:04 -07:00
..
avm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-08-22 22:37:04 -07:00
eicon
mISDN	isdn: mISDN: call pci_disable_device() if pci_probe() failed	2010-08-10 02:51:11 -07:00
Kconfig
Makefile