Merge commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Sep 2014 17:10:12 +0000 (19:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Sep 2014 17:10:29 +0000 (19:10 +0200)
* commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23':
  x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags

See: 428aa14a4851711ea1aa3f9b2d5bac867434993f
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge