Daniel Vetter ff5f4b0585 Merge remote-tracking branch 'airlied/drm-next' into for-airlied ... Manually resolve the conflict between the new enum drm property helpers in drm-next and the new "force-dvi" option that the "audio" output property gained in drm-intel-next. While resolving this conflict, switch the new drm_prop_enum_list to use the newly introduced enum defines instead of magic values. Conflicts: drivers/gpu/drm/i915/intel_modes.c Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2012-02-23 14:56:11 +01:00
..
acpi	Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release	2012-01-23 19:47:06 -05:00
asm-generic	…
crypto	…
drm	Merge remote-tracking branch 'airlied/drm-next' into for-airlied	2012-02-23 14:56:11 +01:00
keys	…
linux	include/linux/lp8727.h: Remove executable bit	2012-02-02 15:43:40 -08:00
math-emu	…
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-01-18 12:53:54 -08:00
misc	…
mtd	…
net	net/tcp: Fix tcp memory limits initialization when !CONFIG_SYSCTL	2012-01-30 12:41:06 -05:00
pcmcia	…
rdma	…
rxrpc	…
scsi	…
sound	…
target	…
trace	…
video	…
xen	…
Kbuild	…