Merge branch 'upstream' into tizen
authorBoram Park <boram1288.park@samsung.com>
Wed, 9 Apr 2014 23:06:40 +0000 (08:06 +0900)
committerBoram Park <boram1288.park@samsung.com>
Wed, 9 Apr 2014 23:06:40 +0000 (08:06 +0900)
commite9241e0100fd0a96d01adc52a0499b8d1ffd56fd
tree11ae9574bf8842213991eef807c615809bde42ff
parentd7fbb5c11b41bb71b9173daea2f48d855bc61316
parentd5a674d26d1b4ed377fe98c403f77f3f21bbb473
Merge branch 'upstream' into tizen

Conflicts:
xinit.c

Change-Id: I4668d4946e67be9aad2568b6a0ef56cb40c3bda1
xinit.c