Merge commit 'origin'

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index e4d563543b11..4e7e958e8f67 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -51,7 +51,7 @@ nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
 
         memset(&args, 0, sizeof(args));
         args.mon_name = nsm->sm_name;
-        args.addr = nsm->sm_addr.sin_addr.s_addr;
+        args.addr = nsm_addr_in(nsm)->sin_addr.s_addr;
         args.prog = NLM_PROGRAM;
         args.vers = 3;
         args.proc = NLMPROC_NSM_NOTIFY;