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)
commit1e678007800ad9bd7332ea4f2250f5bcfac369ad
tree81c2c61816a793cff5e3586fc172983b0e791891
parent8378aae7293575cecad9cccb23226708e2303ccf
parent80fefbed623491b92fe59ead99225f99c0d0ca08
Merge commit '80fefbed623491b92fe59ead99225f99c0d0ca08'

* commit '80fefbed623491b92fe59ead99225f99c0d0ca08':
  x86: cpu: Restore some explanatory comments removed in 7160bb7

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