summaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 11:54:39 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 11:54:39 -0700
commit804b908adfcffe3831621acb6c8a776585983d2a (patch)
tree9664d4395ae8e590e50c568225ea88435383ed99 /fs/lockd
parent1b3e4c706c19dec10b11dac1b23071e3e4b262ad (diff)
parentce0e32e65f70337e0732c97499b643205fa8ea31 (diff)
downloadblackbird-op-linux-804b908adfcffe3831621acb6c8a776585983d2a.tar.gz
blackbird-op-linux-804b908adfcffe3831621acb6c8a776585983d2a.zip
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: [NET]: Fix possible dev_deactivate race condition [INET]: Justification for local port range robustness. [PACKET]: Kill unused pg_vec_endpage() function [NET]: QoS/Sched as menuconfig [NET]: Fix bug in sk_filter race cures. [PATCH] mac80211: make ieee802_11_parse_elems return void
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud