IPMI - Fix Math bug getting new wattage.
Merge remote-tracking branch 'origin/slurm-2.6'
switch/generic: Performance enhancement
Modify error message for incompatible RPC versions
Corrected the AcctGatherProfileType documentation.
Merge branch 'slurm-2.6'
BLUEGENE - fixed missing list_sort change
CRAY - remove unneeded lib
Merge remote-tracking branch 'upstream/master'
CRAY - Add some build requirements for a native Cray
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:cray-software/slurm
Remove lli build requirement. Remove patch file (should be generated on
the fly)