diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 15:10:07 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 15:10:11 +1100 |
| commit | ae6c23f03f0eaef02bee1ce99360659558b9bc9e (patch) | |
| tree | afbf73d1e61e77ddbe3d8ce4fc2d3da8dd53f796 /include/linux/rwsem.h | |
| parent | b2ba9ad8243c29a3006e20d95b763b7dd7cb4c4d (diff) | |
| parent | acb4f4ad94bfbaca1b364bc424aa7a49d7e030b9 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/arm/mach-omap2/irq.c
arch/arm64/include/asm/Kbuild
arch/x86/kernel/entry_64.S
arch/x86/kernel/ptrace.c
fs/nfs/blocklayout/blocklayoutdev.c
fs/nfs/blocklayout/blocklayoutdm.c
Diffstat (limited to 'include/linux/rwsem.h')
| -rw-r--r-- | include/linux/rwsem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h index 035d3c57fc8a..8f498cdde280 100644 --- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h @@ -149,7 +149,7 @@ extern void downgrade_write(struct rw_semaphore *sem); * static then another method for expressing nested locking is * the explicit definition of lock class keys and the use of * lockdep_set_class() at lock initialization time. - * See Documentation/lockdep-design.txt for more details.) + * See Documentation/locking/lockdep-design.txt for more details.) */ extern void down_read_nested(struct rw_semaphore *sem, int subclass); extern void down_write_nested(struct rw_semaphore *sem, int subclass); |