Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/misc/hpilo.h b/drivers/misc/hpilo.h
index 247eb386a973..54e43adbdea1 100644
--- a/drivers/misc/hpilo.h
+++ b/drivers/misc/hpilo.h
@@ -79,21 +79,21 @@ struct ilo_hwinfo {
 struct ccb {
         union {
                 char *send_fifobar;
-                u64 padding1;
+                u64 send_fifobar_pa;
         } ccb_u1;
         union {
                 char *send_desc;
-                u64 padding2;
+                u64 send_desc_pa;
         } ccb_u2;
         u64 send_ctrl;
 
         union {
                 char *recv_fifobar;
-                u64 padding3;
+                u64 recv_fifobar_pa;
         } ccb_u3;
         union {
                 char *recv_desc;
-                u64 padding4;
+                u64 recv_desc_pa;
         } ccb_u4;
         u64 recv_ctrl;