aboutsummaryrefslogtreecommitdiff
path: root/include/linux/concap.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-18 08:25:14 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-18 08:25:14 -0700
commitbfea13d4a127aab4c10085b6f9b6e2ff4f023f79 (patch)
tree4195848eb43a12409511cea39903c3e4c6249281 /include/linux/concap.h
parent32f9306b161a5e0c892132f7227f36de94090289 (diff)
parentf6c5d736af6bc71cebc017e4001ec5efff1ee116 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPV4]: Remove IPVS icmp hack from route.c for now. [IPV4]: Correct rp_filter help text. [TCP]: TCP_CONG_YEAH requires TCP_CONG_VEGAS [TCP] slow start: Make comments and code logic clearer. [BLUETOOTH]: Fix locking in hci_sock_dev_event(). [NET]: Fix BMSR_100{HALF,FULL}2 defines in linux/mii.h [NET]: lockdep classes in register_netdevice
Diffstat (limited to 'include/linux/concap.h')
0 files changed, 0 insertions, 0 deletions