Pull request

[Tim Gardner]

Matthew Garrett wrote:
> The following changes since commit c38a914dac01076ed3ed82cf5ca85cddc9da25ff:
>   Matthew Garrett (1):
>         Merge branch 'master' of git://kernel.ubuntu.com/ubuntu/ubuntu-gutsy
> 
> are available in the git repository at:
> 
>   ssh://kernel.ubuntu.com/srv/kernel.ubuntu.com/git/mjg59/ubuntu-gutsy.git master
> 
> Matthew Garrett (3):
>       UBUNTU: Disable Thinkpad backlight support on machines with ACPI video
>       UBUNTU: Don't attempt to register a callback if there is no CMOS object
>       UBUNTU: Update ACPI bay hotswap code to support locking
> 
>  drivers/ata/libata-acpi.c    |   53 +++++++++++++++++++++++++++++++++--------
>  drivers/misc/thinkpad_acpi.c |   36 +++++++++++++++++++++++++++-
>  2 files changed, 76 insertions(+), 13 deletions(-)
> 

All pulled.

-- 
Tim Gardner tim.gardner at ubuntu.com