diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-31 23:44:08 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-31 23:44:08 +0100 |
| commit | e06f42d6c127883e58b747048752f44ae208ae47 (patch) | |
| tree | 16b28e067eb7a85259d8a2025fb9256fda55bdc5 /drivers/pcmcia/sa1100_shannon.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
| parent | NLM: Set address family before calling nlm_host_rebooted() (diff) | |
| download | linux-e06f42d6c127883e58b747048752f44ae208ae47.tar.xz linux-e06f42d6c127883e58b747048752f44ae208ae47.zip | |
Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.28' of git://linux-nfs.org/~bfields/linux:
NLM: Set address family before calling nlm_host_rebooted()
nfsd: fix failure to set eof in readdir in some situations
Diffstat (limited to 'drivers/pcmcia/sa1100_shannon.c')
0 files changed, 0 insertions, 0 deletions