[systemd/f20: 4/5] Merge branch 'master' into f20

[Harald Hoyer]

commit 5f74ee97b6c631d173791a0335e0dee065db5711
Merge: ebb1fd3 d4ee253
Author: Harald Hoyer <harald at redhat.com>
Date:   Mon Sep 16 17:18:37 2013 -0500

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

 ...EL-units-add-Install-section-to-tmp.mount.patch |   24 ++
 ...all-add-fedora-specific-callouts-to-new-k.patch |   42 +++
 0003-core-cgroup-first-print-then-free.patch       |   23 ++
 0004-swap-fix-reverse-dependencies.patch           |   27 ++
 0005-update-TODO.patch                             |   22 ++
 ...tup-generator-don-t-create-tmp-swap-units.patch |   50 ++++
 ...generator-allow-specifying-options-in-pro.patch |  185 +++++++++++++
 ...nt-rename-repeat_unmont-to-repeat_unmount.patch |   41 +++
 ...d-the-missing-setting-of-variable-s-value.patch |   24 ++
 0010-cgroup-correct-the-log-information.patch      |   23 ++
 ...oup-fix-incorrectly-setting-memory-cgroup.patch |   43 +++
 ...-we-should-return-errno-of-failed-loop_wr.patch |   22 ++
 0013-update-TODO.patch                             |   24 ++
 0014-libudev-fix-move_later-comparison.patch       |   24 ++
 ...-document-luks.options-kernel-commandline.patch |   23 ++
 0016-keymap-remove-some-commented-out-lines.patch  |   33 +++
 ...ibernation-only-if-there-s-enough-free-sw.patch |  259 ++++++++++++++++++
 0018-README-add-SCSI-BSG-option.patch              |   24 ++
 ...reate-.wants-symlink-to-auto-swap-devices.patch |   87 ++++++
 ...roup-add-missing-equals-for-BlockIOWeight.patch |   22 ++
 0021-Assume-that-proc-meminfo-can-be-missing.patch |   50 ++++
 ....c-do-not-point-users-to-logs-when-unit-n.patch |   63 +++++
 ...dity-of-session-name-when-received-from-o.patch |  283 ++++++++++++++++++++
 ...les-avoid-erroring-on-trailing-whitespace.patch |   27 ++
 0025-keymap-Add-Samsung-Series-5-Ultra.patch       |   65 +++++
 systemd.spec                                       |   31 ++-
 26 files changed, 1540 insertions(+), 1 deletions(-)
---