[kexec-tools/f21: 5/5] Merge branch 'master' into f21

[WANG Chao]

commit 1110eea635ffcd76f9eaa608a6ca71e8fa26ea71
Merge: 5ee47cc fd3900d
Author: WANG Chao <chaowang at redhat.com>
Date:   Fri Sep 26 13:06:52 2014 +0800

    Merge branch 'master' into f21

 dracut-module-setup.sh  |    5 ++++-
 kdump.sysconfig.ppc64   |    2 +-
 kdump.sysconfig.ppc64le |    2 +-
 kexec-tools.spec        |   10 +++++++++-
 4 files changed, 15 insertions(+), 4 deletions(-)
---