Linus Torvalds d7e9660ad9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits) netxen: update copyright netxen: fix tx timeout recovery netxen: fix file firmware leak netxen: improve pci memory access netxen: change firmware write size tg3: Fix return ring size breakage netxen: build fix for INET=n cdc-phonet: autoconfigure Phonet address Phonet: back-end for autoconfigured addresses Phonet: fix netlink address dump error handling ipv6: Add IFA_F_DADFAILED flag net: Add DEVTYPE support for Ethernet based devices mv643xx_eth.c: remove unused txq_set_wrr() ucc_geth: Fix hangs after switching from full to half duplex ucc_geth: Rearrange some code to avoid forward declarations phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs drivers/net/phy: introduce missing kfree drivers/net/wan: introduce missing kfree net: force bridge module(s) to be GPL Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded ... Fixed up trivial conflicts: - arch/x86/include/asm/socket.h converted to <asm-generic/socket.h> in the x86 tree. The generic header has the same new #define's, so that works out fine. - drivers/net/tun.c fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that switched over to using 'tun->socket.sk' instead of the redundantly available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks to the TUN driver") which added a new 'tun->sk' use. Noted in 'next' by Stephen Rothwell.		2009-09-14 10:37:28 -07:00
..
b2c2	V4L/DVB (12291): b2c2: fix frontends compiled into kernel	2009-07-24 14:03:31 -03:00
bt8xx	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
dm1105	V4L/DVB (11984): Add support for yet another SDMC DM1105 based DVB-S card.	2009-06-16 19:07:48 -03:00
dvb-core	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-12 17:44:53 -07:00
dvb-usb	V4L/DVB (12371): af9015: Fix for crash in dvb-usb-af9015	2009-08-13 20:39:03 -03:00
firewire	V4L/DVB (11739): remove driver_data direct access of struct device	2009-06-16 18:20:58 -03:00
frontends	V4L/DVB (12440): Use kzalloc for frontend states to have struct dvb_frontend properly	2009-08-13 20:39:14 -03:00
pluto2	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
siano	V4L/DVB (12451): Update KConfig File to enable SDIO and USB interfaces	2009-08-31 02:24:53 -03:00
ttpci	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
ttusb-budget	V4L/DVB (10149): ttusb-budget: make it depend on PCI	2009-01-02 17:12:21 -02:00
ttusb-dec	V4L/DVB (10248): v4l-dvb: fix a bunch of compile warnings.	2009-01-29 08:38:04 -02:00
Kconfig	firedtv: massive refactoring	2009-02-24 14:51:29 +01:00
Makefile	firedtv: rename files, variables, functions from firesat to firedtv	2009-02-24 14:51:29 +01:00