Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux into drm-next
authorInki Dae <inki.dae@samsung.com>
Tue, 8 May 2012 09:02:50 +0000 (18:02 +0900)
committerInki Dae <inki.dae@samsung.com>
Tue, 8 May 2012 09:02:50 +0000 (18:02 +0900)

Trivial merge