Merge branch 'drm-next' of ../main_line/linux-drm into dave-drm-next
authorInki Dae <inki.dae@samsung.com>
Fri, 27 Jul 2012 02:09:46 +0000 (11:09 +0900)
committerInki Dae <inki.dae@samsung.com>
Fri, 27 Jul 2012 02:09:46 +0000 (11:09 +0900)

Trivial merge