[lirc/f14/master: 7/7] Merge branch 'f15' into f14

[Jarod Wilson]

commit 240cae06a138f4481ecd941dec68374c94d84c60
Merge: 2d479ff aee4852
Author: Jarod Wilson <jarod at redhat.com>
Date:   Sun Mar 27 00:04:47 2011 -0400

    Merge branch 'f15' into f14
    
    Conflicts:
    	lirc.spec
    	sources

 .gitignore                                         |    1 +
 lirc-0.8.6-ioctl-portability.patch                 |   67 -----------
 lirc-dont-exit.patch                               |   20 ----
 lirc-in-kernel-ioctls.patch                        |  116 --------------------
 ...se-new-instead-of-conf-as-filename-suffix.patch |   21 ----
 lirc.spec                                          |   22 +---
 sources                                            |    2 +-
 7 files changed, 9 insertions(+), 240 deletions(-)
---
diff --cc lirc.spec
index 7adf9f5,ae952d6..a3b957e
--- a/lirc.spec
+++ b/lirc.spec
@@@ -310,8 -297,13 +297,13 @@@ f
  
  
  %changelog
- * Mon Dec 20 2010 Jarod Wilson <jarod at redhat.com> 0.9.0-0.1.pre1
+ * Sat Mar 26 2011 Jarod Wilson <jarod at redhat.com> 0.9.0-1
+ - Update to lirc 0.9.0 release
+ 
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-0.2.pre1
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
++* Mon Dec 20 2010 Jarod Wilson <jarod at redhat.com> 0.9.0-0.2.pre1
 +- Disable in-kernel IR decoding when starting up lircd, reenable on shutdown
+ 
+ * Tue Oct 26 2010 Jarod Wilson <jarod at redhat.com> 0.9.0-0.1.pre1
  - Update to lirc 0.9.0-pre1 snapshot
  - Add conditional flag for building with iguanaIR support (there's an
    iguanaIR package awaiting review right now)