Dave Airlie a5bd4f8ab0 Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next ... Just one-liner which corrects a select statement for DRM_KMS_FB_HELPER which looks like it was missed in the initial merge. Based on 3.13. * 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox: (55 commits) DRM: armada: fix missing DRM_KMS_FB_HELPER select		2014-01-29 09:38:32 +10:00
..
core	drm/nouveau/device: provide a way for devinit to mark engines as disabled	2014-01-23 13:39:13 +10:00
engine	drm/nv50/gr: print mpc trap name when it's not an mp trap	2014-01-23 13:39:17 +10:00
include	drm/nv50-/devinit: prevent use of engines marked as disabled by hw/vbios	2014-01-23 13:39:13 +10:00
subdev	Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next	2014-01-29 09:38:32 +10:00
os.h	drm/nouveau: use MSI interrupts	2013-09-04 13:48:23 +10:00