Linus Torvalds
fffddfd6c8
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
...
Pull drm merge from Dave Airlie:
"Highlights:
- TI LCD controller KMS driver
- TI OMAP KMS driver merged from staging
- drop gma500 stub driver
- the fbcon locking fixes
- the vgacon dirty like zebra fix.
- open firmware videomode and hdmi common code helpers
- major locking rework for kms object handling - pageflip/cursor
won't block on polling anymore!
- fbcon helper and prime helper cleanups
- i915: all over the map, haswell power well enhancements, valleyview
macro horrors cleaned up, killing lots of legacy GTT code,
- radeon: CS ioctl unification, deprecated UMS support, gpu reset
rework, VM fixes
- nouveau: reworked thermal code, external dp/tmds encoder support
(anx9805), fences sleep instead of polling,
- exynos: all over the driver fixes."
Lovely conflict in radeon/evergreen_cs.c between commit de0babd60d
("drm/radeon: enforce use of radeon_get_ib_value when reading user cmd")
and the new changes that modified that evergreen_dma_cs_parse()
function.
* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (508 commits)
drm/tilcdc: only build on arm
drm/i915: Revert hdmi HDP pin checks
drm/tegra: Add list of framebuffers to debugfs
drm/tegra: Fix color expansion
drm/tegra: Split DC_CMD_STATE_CONTROL register write
drm/tegra: Implement page-flipping support
drm/tegra: Implement VBLANK support
drm/tegra: Implement .mode_set_base()
drm/tegra: Add plane support
drm/tegra: Remove bogus tegra_framebuffer structure
drm: Add consistency check for page-flipping
drm/radeon: Use generic HDMI infoframe helpers
drm/tegra: Use generic HDMI infoframe helpers
drm: Add EDID helper documentation
drm: Add HDMI infoframe helpers
video: Add generic HDMI infoframe helpers
drm: Add some missing forward declarations
drm: Move mode tables to drm_edid.c
drm: Remove duplicate drm_mode_cea_vic()
gma500: Fix n, m1 and m2 clock limits for sdvo and lvds
...
2013-02-25 16:46:44 -08:00
..
accessibility
acpi
The sweeping change is to make add_taint() explicitly indicate whether to disable
2013-02-25 15:41:43 -08:00
amba
ata
1) apply, and then revert, the sysfs export of ATA host controller number.
2013-02-24 17:32:15 -08:00
atm
auxdisplay
base
The sweeping change is to make add_taint() explicitly indicate whether to disable
2013-02-25 15:41:43 -08:00
bcma
block
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
bluetooth
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
bus
cdrom
char
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-02-25 16:46:44 -08:00
clk
arm-soc: device tree conversions
2013-02-21 15:38:49 -08:00
clocksource
arm-soc: virtualization changes
2013-02-21 15:40:16 -08:00
connector
net: proc: change proc_net_remove to remove_proc_entry
2013-02-18 14:53:08 -05:00
cpufreq
arm-soc: driver specific changes
2013-02-21 15:12:18 -08:00
cpuidle
arm-soc: soc-specific updates
2013-02-21 15:27:22 -08:00
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-02-25 15:56:15 -08:00
dca
devfreq
dio
dma
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-02-23 17:09:55 -08:00
edac
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
eisa
extcon
Char/Misc driver patches for 3.9-rc1
2013-02-21 13:57:13 -08:00
firewire
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
firmware
memory-hotplug: remove /sys/firmware/memmap/X sysfs
2013-02-23 17:50:12 -08:00
gpio
This is the MFD pull request for the 3.9 merge window.
2013-02-24 20:00:58 -08:00
gpu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-02-25 16:46:44 -08:00
hid
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2013-02-24 17:35:10 -08:00
hsi
hv
Char/Misc driver patches for 3.9-rc1
2013-02-21 13:57:13 -08:00
hwmon
ACPI and power management updates for 3.9-rc1
2013-02-20 11:26:56 -08:00
hwspinlock
i2c
arm-soc: soc-specific updates
2013-02-21 15:27:22 -08:00
ide
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
idle
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-02-22 19:25:09 -08:00
iio
Staging tree update for 3.9-rc1
2013-02-21 12:11:44 -08:00
infiniband
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
input
This is the MFD pull request for the 3.9 merge window.
2013-02-24 20:00:58 -08:00
iommu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-02-25 16:46:44 -08:00
ipack
Char/Misc driver patches for 3.9-rc1
2013-02-21 13:57:13 -08:00
irqchip
arm-soc: cleanups
2013-02-21 14:58:40 -08:00
isdn
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
leds
lguest
tty/serial patches for 3.9-rc1
2013-02-21 13:41:04 -08:00
macintosh
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-02-23 17:09:55 -08:00
mailbox
md
drivers/md/persistent-data/dm-transaction-manager.c: rename HASH_SIZE
2013-02-23 17:50:08 -08:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2013-02-24 17:35:10 -08:00
memory
memstick
This is the MFD pull request for the 3.9 merge window.
2013-02-24 20:00:58 -08:00
message
mfd
This is the MFD pull request for the 3.9 merge window.
2013-02-24 20:00:58 -08:00
misc
Char/Misc driver patches for 3.9-rc1
2013-02-21 13:57:13 -08:00
mmc
This is the MFD pull request for the 3.9 merge window.
2013-02-24 20:00:58 -08:00
mtd
arm-soc: device tree conversions
2013-02-21 15:38:49 -08:00
net
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-02-23 17:09:55 -08:00
nfc
ntb
nubus
of
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
oprofile
parisc
parisc: led driver requires CONFIG_VM_EVENT_COUNTERS
2013-02-20 22:51:52 +01:00
parport
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2013-02-21 17:54:03 -08:00
pci
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2013-02-21 17:54:03 -08:00
pcmcia
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
pinctrl
arm-soc: device tree conversions
2013-02-21 15:38:49 -08:00
platform
Staging tree update for 3.9-rc1
2013-02-21 12:11:44 -08:00
pnp
power
Staging tree update for 3.9-rc1
2013-02-21 12:11:44 -08:00
pps
ps3
ptp
pwm
rapidio
regulator
Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next
2013-02-19 12:43:12 +00:00
remoteproc
arm-soc: multiplatform support
2013-02-21 15:20:41 -08:00
rpmsg
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
rtc
This is the MFD pull request for the 3.9 merge window.
2013-02-24 20:00:58 -08:00
s390
Merge tag 'kvm-3.9-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2013-02-24 13:07:18 -08:00
sbus
scsi
1) apply, and then revert, the sysfs export of ATA host controller number.
2013-02-24 17:32:15 -08:00
sfi
sh
sn
spi
arm-soc: soc-specific updates
2013-02-21 15:27:22 -08:00
ssb
staging
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-02-25 16:46:44 -08:00
target
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
tc
thermal
tty
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-02-25 16:46:44 -08:00
uio
usb
This is the MFD pull request for the 3.9 merge window.
2013-02-24 20:00:58 -08:00
uwb
vfio
vhost
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
video
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-02-25 16:46:44 -08:00
virt
virtio
vlynq
vme
w1
Char/Misc driver patches for 3.9-rc1
2013-02-21 13:57:13 -08:00
watchdog
This is the MFD pull request for the 3.9 merge window.
2013-02-24 20:00:58 -08:00
xen
Features:
2013-02-24 16:18:31 -08:00
zorro
Kconfig
Char/Misc driver patches for 3.9-rc1
2013-02-21 13:57:13 -08:00
Makefile
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-02-23 17:09:55 -08:00