aha/net/xfrm
Linus Torvalds d7fc02c7ba 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
2009-12-08 07:55:01 -08:00
..
Kconfig ipsec: ipcomp - Merge IPComp implementations 2008-07-25 02:54:40 -07:00
Makefile netns xfrm: per-netns sysctls 2008-11-25 18:00:48 -08:00
xfrm_algo.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-12-01 22:13:38 -08:00
xfrm_hash.c
xfrm_hash.h Fix xfrm hash collisions by changing __xfrm4_daddr_saddr_hash to hash addresses with addition 2009-08-09 21:45:31 -07:00
xfrm_input.c net: skb->dst accessors 2009-06-03 02:51:04 -07:00
xfrm_ipcomp.c ipcomp: Remove spurious truesize increase 2009-01-11 00:04:11 -08:00
xfrm_output.c net: skb->dst accessors 2009-06-03 02:51:04 -07:00
xfrm_policy.c net: skb->dst accessors 2009-06-03 02:51:04 -07:00
xfrm_proc.c net: file_operations should be const 2009-09-02 01:03:53 -07:00
xfrm_state.c xfrm: Store aalg in xfrm_state with a user specified truncation length 2009-11-25 15:48:38 -08:00
xfrm_sysctl.c sysctl net: Remove unused binary sysctl code 2009-11-12 02:05:06 -08:00
xfrm_user.c net: Allow xfrm_user_net_exit to batch efficiently. 2009-12-03 12:22:03 -08:00