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
..
accessibility
acpi	Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release	2012-01-23 19:47:06 -05:00
amba
ata	[libata] ata_piix: Add Toshiba Satellite Pro A120 to the quirks list	2012-01-17 20:50:53 -05:00
atm
auxdisplay
base	Here are some patches for the 3.3-rc1 tree.	2012-01-28 18:20:48 -08:00
bcma	bcma: connect the bcma bus suspend/resume to the bcma driver suspend/resume	2012-01-17 09:54:08 -05:00
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2012-02-02 15:47:33 -08:00
bluetooth
cdrom
char	Merge remote-tracking branch 'airlied/drm-fixes' into drm-intel-next-queued	2012-02-10 17:14:49 +01:00
clk
clocksource
connector
cpufreq
cpuidle
crypto
dca
devfreq
dio
dma	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-01-17 18:40:24 -08:00
edac
eisa
firewire	firewire: ohci: disable MSI on Ricoh controllers	2012-01-30 21:33:34 +01:00
firmware
gpio	gpio: tps65910: Use correct offset for gpio initialization	2012-01-18 13:48:43 -07:00
gpu	Merge remote-tracking branch 'airlied/drm-next' into for-airlied	2012-02-23 14:56:11 +01:00
hid
hv
hwmon	hwmon: (w83627ehf) Disable setting DC mode for pwm2, pwm3 on NCT6776F	2012-01-29 13:06:07 -08:00
hwspinlock
i2c	Merge branches 'for-33/i2c/eg20t' and 'for-33/i2c/omap' into for-linus/i2c-33	2012-01-17 23:30:41 +00:00
ide
idle	ACPI processor hotplug: Delay acpi_processor_start() call for hotplugged cores	2012-01-19 21:26:32 -05:00
ieee802154
infiniband	Merge branches 'cma', 'ipath', 'misc', 'mlx4', 'nes' and 'qib' into for-next	2012-01-30 16:18:21 -08:00
input
iommu
isdn
leds	leds: add led driver for Bachmann's ot200	2012-01-23 08:38:47 -08:00
lguest
macintosh
mca
md	Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block	2012-01-15 12:24:45 -08:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-01-26 17:04:47 -08:00
memstick
message
mfd	MFD: ucb1x00-ts: fix resume failure	2012-01-22 21:10:40 +00:00
misc	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-01-17 18:40:24 -08:00
mmc	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-01-17 18:40:24 -08:00
mtd	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-01-17 18:40:24 -08:00
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-01-27 20:40:18 -05:00
nfc
nubus
of
oprofile
parisc
parport
pci	kernel-doc: fix new warnings in pci	2012-01-23 08:44:53 -08:00
pcmcia	PCMCIA: fix sa1111 oops on remove	2012-01-24 21:33:26 +00:00
pinctrl	pinctrl: add checks for empty function names	2012-01-26 14:13:11 +01:00
platform
pnp
power
pps
ps3
ptp
rapidio
regulator	This fixes an integration issue with the regulator device tree bindings	2012-01-30 10:16:25 -08:00
rtc	Revert "RTC: sa1100: remove redundant code of setting alarm"	2012-01-19 17:26:26 +00:00
s390	[S390] dasd: revalidate server for new pathgroup	2012-01-18 18:03:42 +01:00
sbus
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2012-01-26 12:43:57 -08:00
sfi
sh
sn
spi	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-01-17 18:40:24 -08:00
ssb
staging	staging: fix go7007-usb license	2012-02-01 18:29:33 -08:00
target
tc
telephony
thermal	thermal: Rename generate_netlink_event	2012-01-23 03:15:25 -05:00
tty	serial: Kill off Moorestown code	2012-01-26 11:19:46 -08:00
uio
usb	Here are a bunch of USB patches for 3.3-rc1.	2012-01-30 11:38:28 -08:00
uwb
vhost
video	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2012-01-26 12:43:57 -08:00
virt
virtio	virtio: correct the memory barrier in virtqueue_kick_prepare()	2012-01-28 08:10:23 +10:30
vlynq
w1
watchdog	watchdog: iTCO_wdt: add Intel Lynx Point DeviceIDs	2012-01-27 10:01:16 +01:00
xen	xen/granttable: Disable grant v2 for HVM domains.	2012-01-27 11:14:16 -05:00
zorro
Kconfig
Makefile