Merge branch 'master' of git+ssh://repo.or.cz/srv/git/acer_acpi
commit991499a400a6f1b4e272c1e1278506325ba16d3f
authorCarlos Corbacho <carlos@strangeworlds.co.uk>
Sun, 9 Dec 2007 17:37:48 +0000 (9 17:37 +0000)
committerCarlos Corbacho <carlos@strangeworlds.co.uk>
Sun, 9 Dec 2007 17:37:48 +0000 (9 17:37 +0000)
tree1811f6dfaf3cc39b22aa0f03bc9d132706942dfe
parentb1c7178ccde86801d610cdfe18340ea34eda9387
parent6679d9fa485bc48b9a69003ba9dda3dee6717db8
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/acer_acpi

Conflicts:

acer_acpi.c
acer_acpi.c