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: (1815 commits) mac80211: fix reorder buffer release iwmc3200wifi: Enable wimax core through module parameter iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter iwmc3200wifi: Coex table command does not expect a response iwmc3200wifi: Update wiwi priority table iwlwifi: driver version track kernel version iwlwifi: indicate uCode type when fail dump error/event log iwl3945: remove duplicated event logging code b43: fix two warnings ipw2100: fix rebooting hang with driver loaded cfg80211: indent regulatory messages with spaces iwmc3200wifi: fix NULL pointer dereference in pmkid update mac80211: Fix TX status reporting for injected data frames ath9k: enable 2GHz band only if the device supports it airo: Fix integer overflow warning rt2x00: Fix padding bug on L2PAD devices. WE: Fix set events not propagated b43legacy: avoid PPC fault during resume b43: avoid PPC fault during resume tcp: fix a timewait refcnt race ... Fix up conflicts due to sysctl cleanups (dead sysctl_check code and CTL_UNNUMBERED removed) in kernel/sysctl_check.c net/ipv4/sysctl_net_ipv4.c net/ipv6/addrconf.c net/sctp/sysctl.c
No related branches found
No related tags found
Showing
- Documentation/feature-removal-schedule.txt 0 additions, 12 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/isdn/README.gigaset 21 additions, 13 deletionsDocumentation/isdn/README.gigaset
- Documentation/kernel-parameters.txt 3 additions, 0 deletionsDocumentation/kernel-parameters.txt
- Documentation/networking/bonding.txt 41 additions, 1 deletionDocumentation/networking/bonding.txt
- Documentation/networking/ip-sysctl.txt 34 additions, 2 deletionsDocumentation/networking/ip-sysctl.txt
- Documentation/powerpc/dts-bindings/fsl/mpc5200.txt 10 additions, 0 deletionsDocumentation/powerpc/dts-bindings/fsl/mpc5200.txt
- MAINTAINERS 11 additions, 3 deletionsMAINTAINERS
- arch/alpha/include/asm/socket.h 2 additions, 0 deletionsarch/alpha/include/asm/socket.h
- arch/alpha/include/asm/unistd.h 2 additions, 1 deletionarch/alpha/include/asm/unistd.h
- arch/alpha/kernel/systbls.S 1 addition, 0 deletionsarch/alpha/kernel/systbls.S
- arch/arm/include/asm/socket.h 2 additions, 0 deletionsarch/arm/include/asm/socket.h
- arch/arm/kernel/calls.S 1 addition, 0 deletionsarch/arm/kernel/calls.S
- arch/avr32/include/asm/socket.h 2 additions, 0 deletionsarch/avr32/include/asm/socket.h
- arch/avr32/kernel/syscall_table.S 1 addition, 0 deletionsarch/avr32/kernel/syscall_table.S
- arch/blackfin/mach-common/entry.S 1 addition, 0 deletionsarch/blackfin/mach-common/entry.S
- arch/cris/include/asm/socket.h 2 additions, 0 deletionsarch/cris/include/asm/socket.h
- arch/frv/include/asm/socket.h 2 additions, 0 deletionsarch/frv/include/asm/socket.h
- arch/h8300/include/asm/socket.h 2 additions, 0 deletionsarch/h8300/include/asm/socket.h
- arch/ia64/include/asm/socket.h 2 additions, 0 deletionsarch/ia64/include/asm/socket.h
- arch/ia64/include/asm/unistd.h 2 additions, 1 deletionarch/ia64/include/asm/unistd.h
Loading
Please register or sign in to comment