summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-09 08:31:03 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-09 08:31:03 -0700
commit660ca5317d229ca27dec6a3159423bc0c5291c2d (patch)
tree518372de3101f687f3ba92ead2fe65d2d97f8982 /lib
parente7bc15a9ad07269c48732e9a9874e5938b4700ee (diff)
parentf34d1955dff5a5769d24614d137003f0316406f3 (diff)
downloadop-kernel-dev-660ca5317d229ca27dec6a3159423bc0c5291c2d.zip
op-kernel-dev-660ca5317d229ca27dec6a3159423bc0c5291c2d.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TCP]: H-TCP maxRTT estimation at startup [NETFILTER]: nf_nat: add symbolic dependency on IPv4 conntrack [NETFILTER]: ctnetlink: return EEXIST instead of EINVAL for existing nat'ed conntracks [NETFILTER]: ipt_recent: avoid a possible NULL pointer deref in recent_seq_open() [NET] net/core/utils: fix sparse warning [NetLabel]: add missing rcu_dereference() calls in the LSM domain mapping hash table [PATCH] mac80211: don't allow scanning in monitor mode [PATCH] mac80211: Fix sparse error for sta_last_seq_ctrl_read [PATCH] mac80211: use do { } while (0) for multi-line macros [PATCH] mac80211: missing dev_put in ieee80211_master_start_xmit
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud