Fix a bad merge.
authorDavid Greene <greened@obbligato.org>
Fri, 4 Dec 2009 23:08:02 +0000 (23:08 +0000)
committerDavid Greene <greened@obbligato.org>
Fri, 4 Dec 2009 23:08:02 +0000 (23:08 +0000)
commit03c8406fc19658a3a8dc8ee00fddc88160038683
tree2642e917250de6f60f1706160543df319bb83f2d
parent5e3363255912c559e8251121491a2a9e901f07ac
Fix a bad merge.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@90616 91177308-0d34-0410-b5e6-96231b3b80d8
include/llvm/Target/TargetInstrInfo.h