Merge by Hand
[profile/ivi/kernel-x86-ivi.git] / drivers / input / power.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2