[systemd/f20: 3/3] Merge branch 'master' into f20

[Zbigniew Jędrzejewski-Szmek]

commit a0a9bd8bed9be6e16164eba9d13d157768f3badb
Merge: 754e9c6 d66047d
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Dec 3 19:25:27 2013 -0500

    Merge branch 'master' into f20
    
    Conflicts:
    	systemd.spec

 ...pport-yearly-and-annually-names-the-same-.patch |   38 +++
 ...a-bit-more-conservative-with-pre-allocati.patch |   57 ++++
 ...-manager-don-t-do-plymouth-in-a-container.patch |   26 ++
 0119-nspawn-add-new-drop-capability-switch.patch   |   82 +++++
 ...ind-make-running-PID-1-in-valgrind-useful.patch |   59 ++++
 ...i-boot-generator-don-t-mount-boot-eagerly.patch |   22 ++
 ...-database-of-Bluetooth-company-identifier.patch |  327 ++++++++++++++++++++
 ...n-appending-to-journal-file-allocate-larg.patch |   81 +++++
 0124-journal-make-table-const.patch                |   44 +++
 ...ep-statistics-on-how-of-we-hit-miss-the-m.patch |   92 ++++++
 ...imize-bisection-logic-a-bit-by-caching-th.patch |  246 +++++++++++++++
 ...-iteration-when-we-go-backwards-from-the-.patch |   24 ++
 ...ow-journal_file_copy_entry-to-work-on-non.patch |   26 ++
 0129-journal-simplify-pre-allocation-logic.patch   |   60 ++++
 ...ntion-how-long-we-needed-to-flush-to-var-.patch |   56 ++++
 ...tomount-log-info-about-triggering-process.patch |   26 ++
 ...t-split-detect_vm-into-separate-functions.patch |  205 ++++++++++++
 ...-database-of-Bluetooth-company-identifier.patch |  147 +++++++++
 0134-sysfs-show.c-return-negative-error.patch      |   23 ++
 ...k-if-return-value-from-ttyname_r-is-0-ins.patch |   28 ++
 ...-docs-remove-unneeded-the-s-in-gudev-docs.patch |   38 +++
 ...tly-say-when-multiple-units-can-be-specif.patch |  235 ++++++++++++++
 0138-systemd-treat-reload-failure-as-failure.patch |   90 ++++++
 ...l-silently-in-sd_j_sendv-if-journal-is-un.patch |   34 ++
 systemd.spec                                       |   35 ++-
 25 files changed, 2099 insertions(+), 2 deletions(-)
---
diff --cc systemd.spec
index 7a62f21,759cdad..0b9bdb8
--- a/systemd.spec
+++ b/systemd.spec
@@@ -800,8 -824,15 +824,15 @@@ getent passwd systemd-journal-gateway >
  %{_datadir}/systemd/gatewayd
  
  %changelog
+ * Tue Dec 03 2013 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 208-7
+ - Backport patches (#1023041, #1036845, #1006386?)
+ - HWDB update
+ - Some small new features: nspawn --drop-capability=, running PID 1 under
+   valgrind, "yearly" and "annually" in calendar specifications
+ - Some small documentation and logging updates
+ 
  * Tue Nov 19 2013 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 208-6
 -- Bump version to stay ahead of f20
 +- Back kmod dependency version bump out
  
  * Tue Nov 19 2013 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 208-5
  - Use unit name in PrivateTmp= directories (#957439)