Merge commit '80fefbed623491b92fe59ead99225f99c0d0ca08'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 09:28:15 +0000 (11:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 09:28:21 +0000 (11:28 +0200)
* commit '80fefbed623491b92fe59ead99225f99c0d0ca08':
  x86: cpu: Restore some explanatory comments removed in 7160bb7

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/cpu.h

diff --cc libavutil/cpu.h
Simple merge