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
..
bestcomm
qe_lib	powerpc/qe: Implement qe_alive_during_sleep() helper function	2009-08-30 21:51:33 -07:00
6xx-suspend.S
axonram.c
cpm1.c
cpm2_pic.c
cpm2_pic.h
cpm2.c
cpm_common.c
dart_iommu.c
dart.h
dcr-low.S
dcr.c
fsl_gtm.c
fsl_lbc.c
fsl_msi.c
fsl_msi.h
fsl_pci.c
fsl_pci.h
fsl_rio.c	powerpc: Remove unnecessary semicolons	2009-07-08 13:50:21 +10:00
fsl_soc.c
fsl_soc.h
grackle.c
i8259.c
indirect_pci.c
ipic.c	powerpc: Don't use alloc_bootmem() in init_IRQ() path	2009-07-08 13:50:25 +10:00
ipic.h
Kconfig
Makefile	powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function	2009-06-17 00:30:22 -06:00
micropatch.c
mmio_nvram.c
mpc5xxx_clocks.c	powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function	2009-06-17 00:30:22 -06:00
mpc8xx_pic.c
mpc8xx_pic.h
mpc8xxx_gpio.c
mpic_msi.c
mpic_pasemi_msi.c
mpic_u3msi.c
mpic.c	powerpc: Don't use alloc_bootmem() in init_IRQ() path	2009-07-08 13:50:25 +10:00
mpic.h
msi_bitmap.c
mv64x60_dev.c
mv64x60_pci.c
mv64x60_pic.c
mv64x60_udbg.c
mv64x60.h
of_rtc.c
pmi.c
ppc4xx_gpio.c
ppc4xx_pci.c	powerpc: Remove unnecessary semicolons	2009-07-08 13:50:21 +10:00
ppc4xx_pci.h
ppc4xx_soc.c
rtc_cmos_setup.c
simple_gpio.c
simple_gpio.h
tsi108_dev.c
tsi108_pci.c
uic.c	powerpc: Don't use alloc_bootmem() in init_IRQ() path	2009-07-08 13:50:25 +10:00
xilinx_intc.c	powerpc: Fix i8259 interrupt driver kernel crash on ML510	2009-09-05 14:58:07 -07:00
xilinx_pci.c