From: Len Brown <len.brown@intel.com>
Date: Thu, 7 Feb 2008 08:25:48 +0000 (-0500)
Subject: Merge branches 'release' and 'video' into release
X-Git-Tag: v2.6.25-rc1~297^2~3^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=52b097fff89b14c0b8b7a7deef1d274889b1886d;p=linux-2.6-omap-h63xx.git

Merge branches 'release' and 'video' into release

Conflicts:

	include/acpi/acpi_bus.h

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

52b097fff89b14c0b8b7a7deef1d274889b1886d
diff --cc include/acpi/acpi_bus.h
index 504af20b10c,504af20b10c,3f9f1417ff0..2f1c68c7a72
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@@@ -321,8 -321,8 -321,9 +321,11 @@@@ struct acpi_bus_event 
   
   extern struct kobject *acpi_kobj;
   extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
  +void acpi_bus_private_data_handler(acpi_handle, u32, void *);
  +int acpi_bus_get_private_data(acpi_handle, void **);
++ extern int acpi_notifier_call_chain(struct acpi_device *, u32, u32);
++ extern int register_acpi_notifier(struct notifier_block *);
++ extern int unregister_acpi_notifier(struct notifier_block *);
   /*
    * External Functions
    */