diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-09 02:05:18 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-09 02:05:18 +0200 |
| commit | 44b56603c4c476b845a824cff6fe905c6268b2a1 (patch) | |
| tree | b7e792414fef2390718a657765719fbbb529ce84 /net/ipv6/ip6mr.c | |
| parent | nfsd4: shut down callback queue outside state lock (diff) | |
| parent | nfsd: nfsd_setattr needs to call commit_metadata (diff) | |
| download | linux-44b56603c4c476b845a824cff6fe905c6268b2a1.tar.xz linux-44b56603c4c476b845a824cff6fe905c6268b2a1.zip | |
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
Diffstat (limited to 'net/ipv6/ip6mr.c')
0 files changed, 0 insertions, 0 deletions