Merge branches 'release' and 'fluff' into release

Conflicts:

	drivers/acpi/scan.c
	include/linux/acpi.h

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

diff --cc arch/ia64/kernel/acpi.c
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/acpi/bay.c
Simple merge

diff --cc drivers/acpi/bus.c
Simple merge

diff --cc drivers/acpi/dock.c
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/acpi/pci_irq.c
Simple merge

diff --cc drivers/acpi/scan.c
index c7b0aa52dd230205f25ae2e3c74f469d6ef7c8d1,c7b0aa52dd230205f25ae2e3c74f469d6ef7c8d1,78a82b3c7b60e3929eee0d4831300fb4afaaf2ba..3fac011f9cf964082b463ef20913542ca9bce173
--- 1/drivers/acpi/scan.c
--- 2/drivers/acpi/scan.c
--- 3/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@@ -1034,45 -1034,45 -1021,12 +1034,45 @@@@ static void acpi_device_set_id(struct a
                strcpy(device->pnp.unique_id, uid);
                device->flags.unique_id = 1;
        }
  -     if (cid_list) {
  -             device->pnp.cid_list = kmalloc(cid_list->size, GFP_KERNEL);
  -             if (device->pnp.cid_list)
  -                     memcpy(device->pnp.cid_list, cid_list, cid_list->size);
  -             else
  +     if (cid_list || cid_add) {
  +             struct  acpi_compatible_id_list *list;
  +             int size = 0;
  +             int count = 0;
  +
  +             if (cid_list) {
  +                     size = cid_list->size;
  +             } else if (cid_add) {
  +                     size = sizeof(struct acpi_compatible_id_list);
  +                     cid_list = ACPI_ALLOCATE_ZEROED((acpi_size) size);
  +                     if (!cid_list) {
  +                             printk(KERN_ERR "Memory allocation error\n");
  +                             kfree(buffer.pointer);
  +                             return;
  +                     } else {
  +                             cid_list->count = 0;
  +                             cid_list->size = size;
  +                     }
  +             }
  +             if (cid_add)
  +                     size += sizeof(struct acpi_compatible_id);
  +             list = kmalloc(size, GFP_KERNEL);
  +
  +             if (list) {
  +                     if (cid_list) {
  +                             memcpy(list, cid_list, cid_list->size);
  +                             count = cid_list->count;
  +                     }
  +                     if (cid_add) {
  +                             strncpy(list->id[count].value, cid_add,
  +                                     ACPI_MAX_CID_LENGTH);
  +                             count++;
  +                             device->flags.compatible_ids = 1;
  +                     }
  +                     list->size = size;
  +                     list->count = count;
  +                     device->pnp.cid_list = list;
  +             } else
--                      printk(KERN_ERR "Memory allocation error\n");
++                      printk(KERN_ERR PREFIX "Memory allocation error\n");
        }
   
        kfree(buffer.pointer);

diff --cc include/acpi/acpi_drivers.h
Simple merge

diff --cc include/linux/acpi.h
index 25fb4dcc0e6baa5c3c3a62c161182ef9937e001c,25fb4dcc0e6baa5c3c3a62c161182ef9937e001c,ff68f13a9377e6fb42bd504cae4febbaa0d3ac9e..ddbe7efe590e96bdf25e8c1afa96038126f7a329
--- 1/include/linux/acpi.h
--- 2/include/linux/acpi.h
--- 3/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@@ -115,10 -115,10 -113,6 +113,8 @@@@ int acpi_unmap_lsapic(int cpu)
   
   int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base);
   int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base);
-- 
  +void acpi_irq_stats_init(void);
-- extern int acpi_mp_config;
  +extern u32 acpi_irq_handled;
   
   extern struct acpi_mcfg_allocation *pci_mmcfg_config;
   extern int pci_mmcfg_config_num;