Merge changes I1d5ce226,Ic4d64833 into tizen
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 28 Oct 2014 08:08:29 +0000 (01:08 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 28 Oct 2014 08:08:29 +0000 (01:08 -0700)
* changes:
  target-i386/translate.c: Remove unused tcg_gen_lshift()
  maru_shm: consider unsigned short


Trivial merge