Merge branch 'drm-next' of ../main_line/linux-drm into dave-drm-next
authorInki Dae <inki.dae@samsung.com>
Tue, 22 May 2012 08:41:15 +0000 (17:41 +0900)
committerInki Dae <inki.dae@samsung.com>
Tue, 22 May 2012 08:41:15 +0000 (17:41 +0900)

Trivial merge