[olpc-powerd: 2/2] fix merge

[Peter Robinson]

commit 0a94f3f1403405b22b62d262ea4087f215689d59
Merge: b77e6f2 18f86cc
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Feb 28 00:28:09 2012 +0000

    fix merge

 olpc-powerd.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc olpc-powerd.spec
index 474b9e6,2205e29..6053f0d
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@@ -133,24 -133,9 +133,27 @@@ f
  exit 0
  
  %changelog
 +* Tue Feb 21 2012 Paul Fox <pgf at laptop.org> - 45-1
 +- implement wakeup control for recently controllable devices.
 +
 +* Sun Feb 12 2012 Paul Fox <pgf at laptop.org> - 44-1
 +- implement camera-busy heuristic to inhibit suspend on 1.75
 +- fix touchscreen presence check
 +
 +* Mon Feb  6 2012 <pgf at laptop.org> - 43-1
 +- better support for wlan wakeups on 1.75
 +- initial support for 3.0 and later kernels on XO-1/1.5.
 +- 42-1 (unreleased)
 +- keep olpc-switchd and powerd from respawning due to missing drivers:
 +     AC, battery, DCON, lid and ebook switches.  also defend against
 +     transient errors when accessing AC and battery.
 +- support for XO-3 -- no DCON, different backlight control, different display.
 +- working touchscreen support
 +- (no version 41 was created)
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 42-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sat Dec 24 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 42-1
  - update to 42