Merge branch 'l1t-devel-CMSSW_7_1_0_pre6' of github.com:cms-l1t-offline/cmssw into mydevel-branch
Merge pull request #3589 from ktf/cleanup-buildfiles

Cleanup -- Remove non-existing dependencies.
Merge pull request #3542 from venturia/dqm_sistripmonitorsummary-71x

dQM -- New macro and strip for the web interface to access the single module pedestal and noise values
Merge pull request #3606 from Dr15Jones/makeStaticConstInLinuxCPUTime

Multithreading -- Changed trivial static in LinuxCPUTime to be const
Merge pull request #3596 from ktf/fix-geometry

Clang -- Add explicit load of atomic.
Merge pull request #3611 from fwyzard/clang-hlt-timers

HLT -- HLTrigger/Timer/test: fix rtdsc support and OpenMP checks for CLANG
Merge pull request #3629 from mdhildreth/Muon_SIM_Consumes_fixes_4_30

Consumes -- Muon sim consumes fixes for 71X
Merge pull request #3599 from ktf/clang-cond-formats

Clang -- More clang cleanups
Merge pull request #3613 from Dr15Jones/makeStaticConstInUtilitiesTiming

Multithreading -- Made statics const in Utilities/Timing
parameter changes and small fixes
Merge branch 'l1t-devel-CMSSW_7_1_0_pre6' of github.com:cms-l1t-offline/cmssw into EGIsol_710pre6
add LSBs
Adding AK5->AK4 transition for cosmics
fix up conflict
Merge branch 'l1t-devel-CMSSW_7_1_0_pre6' of github.com:cms-l1t-offline/cmssw into mydevel-branch
removed cout
move back to exclusive EGamma lists while discussion ongoing
Merge branch 'l1t-devel-CMSSW_7_1_0_pre6' of github.com:cms-l1t-offline/cmssw into mydevel-branch
rename according to convention
rename according to convention