Merge branches 'release' and 'video' into release

Conflicts:

	include/acpi/acpi_bus.h

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

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

diff --cc include/acpi/acpi_bus.h
index 504af20b10c10d9c5ee6da12e9075de548701344,504af20b10c10d9c5ee6da12e9075de548701344,3f9f1417ff098988fec92441b0a5c620bd102744..2f1c68c7a7270ea7098a39509690eb5d03614c1d
--- 1/include/acpi/acpi_bus.h
--- 2/include/acpi/acpi_bus.h
--- 3/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
    */