Merge branch 'linux-3.12.y' into tizen_linux_3.12
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 7 May 2014 06:36:57 +0000 (15:36 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 7 May 2014 06:36:57 +0000 (15:36 +0900)

Trivial merge