Merge

diff --cc arch/ia64/hp/common/sba_iommu.c
index 64295162dcb2af722eae48d9bdfc71ad7de239e7,cc86aafecd90e11d7a7e6cd419084beee1d5eb80..d5cdbe360676070b3a1dbc25c34c145fe382cfd6
--- 1/arch/ia64/hp/common/sba_iommu.c
--- 2/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@@ -33,7 -33,7 +33,8 @@@
  #include <linux/seq_file.h>
  #include <linux/acpi.h>
  #include <linux/efi.h>
+ #include <linux/nodemask.h>
 +#include <linux/bitops.h>         /* hweight64() */
  
  #include <asm/delay.h>                /* ia64_get_itc() */
  #include <asm/io.h>

diff --cc arch/ia64/pci/pci.c
Simple merge