Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next

Merge in the upstream tree to bring in the mainline fixes. Conflicts: drivers/gpu/drm/exynos/exynos_drm_fbdev.c drivers/gpu/drm/nouveau/nouveau_sgdma.c
2026-11-10 20:48:12 +00:00 · 2011-12-20 14:43:53 +00:00 · 2011-12-20 14:43:53 +00:00 · 1fbe6f625f
commit 1fbe6f625f
parent 0cecdd818c 384703b8e6
1348 changed files with 16310 additions and 12193 deletions
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
--- a/include/linux/devfreq.h
+++ b/include/linux/devfreq.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/dma_remapping.h
+++ b/include/linux/dma_remapping.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
--- a/include/linux/hwspinlock.h
+++ b/include/linux/hwspinlock.h
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
--- a/include/linux/log2.h
+++ b/include/linux/log2.h
--- a/include/linux/mfd/tps65910.h
+++ b/include/linux/mfd/tps65910.h
--- a/include/linux/mfd/wm8994/registers.h
+++ b/include/linux/mfd/wm8994/registers.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
--- a/include/linux/pci-ats.h
+++ b/include/linux/pci-ats.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/pinctrl/pinctrl.h
+++ b/include/linux/pinctrl/pinctrl.h
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
--- a/include/linux/pstore.h
+++ b/include/linux/pstore.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
--- a/include/linux/sh_clk.h
+++ b/include/linux/sh_clk.h
--- a/include/linux/sh_pfc.h
+++ b/include/linux/sh_pfc.h
--- a/include/linux/shrinker.h
+++ b/include/linux/shrinker.h
--- a/include/linux/sigma.h
+++ b/include/linux/sigma.h
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
--- a/include/linux/virtio_mmio.h
+++ b/include/linux/virtio_mmio.h
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h