diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-09 12:43:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-09 12:43:04 -0700 |
| commit | b95a56809343fb727c818ad1b9da14a17fa92ef6 (patch) | |
| tree | b79ff0d36f216fcadce546aa33219e06f1126b58 /net/mac80211/mlme.c | |
| parent | FRV: Reinstate null behaviour for the GDB remote protocol 'p' command (diff) | |
| parent | Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming (diff) | |
| download | linux-dev-b95a56809343fb727c818ad1b9da14a17fa92ef6.tar.xz linux-dev-b95a56809343fb727c818ad1b9da14a17fa92ef6.zip | |
Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.35' of git://linux-nfs.org/~bfields/linux:
nfsd4: shut down callback queue outside state lock
nfsd: nfsd_setattr needs to call commit_metadata
Diffstat (limited to 'net/mac80211/mlme.c')
0 files changed, 0 insertions, 0 deletions