OpenCloudOS-Kernel/net/rose
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
..
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
af_rose.c net: use net_eq to compare nets 2009-11-25 15:14:13 -08:00
rose_dev.c convert hamradio drivers to netdev_txreturnt_t 2009-09-01 01:13:12 -07:00
rose_in.c [ROSE]: Supress sparse warnings 2008-01-28 15:02:44 -08:00
rose_link.c [ROSE]: Eleminate HZ from ROSE kernel interfaces 2006-05-03 23:28:20 -07:00
rose_loopback.c [ROSE]: Fix rose.ko oops on unload 2007-10-07 23:44:17 -07:00
rose_out.c [PATCH] remove many unneeded #includes of sched.h 2007-02-14 08:09:54 -08:00
rose_route.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
rose_subr.c [PATCH] remove many unneeded #includes of sched.h 2007-02-14 08:09:54 -08:00
rose_timer.c [ROSE]: rose_heartbeat_expiry() locking fix 2005-10-31 16:41:45 -02:00
sysctl_net_rose.c sysctl net: Remove unused binary sysctl code 2009-11-12 02:05:06 -08:00