[kexec-tools: 12/12] Merge branch 'f17'

[Cong Wang]

commit ce7bc4cbf00ba7699ccae6de5058c9fd28937653
Merge: bdbd5c1 2347cce
Author: Cong Wang <xiyou.wangcong at gmail.com>
Date:   Wed Apr 18 18:38:06 2012 +0800

    Merge branch 'f17'
    
    Conflicts:
    	kexec-tools.spec

 kdump.conf                                       |    1 +
 kdump_dracut_modules/99kdumpbase/kdump.sh        |   61 +++++++++++-----
 kdump_dracut_modules/99kdumpbase/module-setup.sh |   11 ++-
 kdumpctl                                         |   82 ++++++++++++++++------
 kexec-tools.spec                                 |   25 +++++--
 mkdumprd                                         |   13 ++++
 sources                                          |    2 +-
 7 files changed, 142 insertions(+), 53 deletions(-)
---