diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-15 00:26:23 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-15 00:26:23 +0400 |
| commit | 8e63dd6e1c589ba99a18df9cbaa41c3178607641 (patch) | |
| tree | e1662280bb1d8227e767c877c1f06c74ec5c40bc /fs/nfsd/nfs4state.c | |
| parent | f88609a0e447fb73851c0f640ed47257838ff99f (diff) | |
| parent | ebb7f616abf6ee11603e6b63aa6c5f84c80a17d0 (diff) | |
| download | linux-8e63dd6e1c589ba99a18df9cbaa41c3178607641.tar.xz | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Fix unpaired __trace_hcall_entry and __trace_hcall_exit
powerpc: Fix RCU idle and hcall tracing
Diffstat (limited to 'fs/nfsd/nfs4state.c')
0 files changed, 0 insertions, 0 deletions