diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 02:24:28 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 02:24:28 +0200 |
| commit | 18a043f9413277523cf5011e594caa1747db4948 (patch) | |
| tree | f5d7e908bf62e67184f91ce83b6b7624755826ac /fs/signalfd.c | |
| parent | Merge branch 'akpm-incoming-1' (diff) | |
| parent | NFS: rename nfs.upcall -> nfs.idmap (diff) | |
| download | linux-18a043f9413277523cf5011e594caa1747db4948.tar.xz linux-18a043f9413277523cf5011e594caa1747db4948.zip | |
Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFS: rename nfs.upcall -> nfs.idmap
NFS: Fix a compile issue in nfs_root
Diffstat (limited to 'fs/signalfd.c')
0 files changed, 0 insertions, 0 deletions