Merge branch 'for-next' into for-linus

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_qes.h b/drivers/infiniband/hw/ehca/ehca_qes.h
index 5d28e3e98a20..90c4efa67586 100644
--- a/drivers/infiniband/hw/ehca/ehca_qes.h
+++ b/drivers/infiniband/hw/ehca/ehca_qes.h
@@ -46,7 +46,7 @@
 
 #include "ehca_tools.h"
 
-/* virtual scatter gather entry to specify remote adresses with length */
+/* virtual scatter gather entry to specify remote addresses with length */
 struct ehca_vsgentry {
         u64 vaddr;
         u32 lkey;
@@ -148,7 +148,7 @@ struct ehca_wqe {
         u32 immediate_data;
         union {
                 struct {
-                        u64 remote_virtual_adress;
+                        u64 remote_virtual_address;
                         u32 rkey;
                         u32 reserved;
                         u64 atomic_1st_op_dma_len;
diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c
index e3ec7fdd67bd..9a3fbfca9b41 100644
--- a/drivers/infiniband/hw/ehca/ehca_reqs.c
+++ b/drivers/infiniband/hw/ehca/ehca_reqs.c
@@ -269,7 +269,7 @@ static inline int ehca_write_swqe(struct ehca_qp *qp,
                 /* no break is intentional here */
         case IB_QPT_RC:
                 /* TODO: atomic not implemented */
-                wqe_p->u.nud.remote_virtual_adress =
+                wqe_p->u.nud.remote_virtual_address =
                         send_wr->wr.rdma.remote_addr;
                 wqe_p->u.nud.rkey = send_wr->wr.rdma.rkey;