Dave Airlie 1fbe6f625f 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

2011-12-20 14:43:53 +00:00

..

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2011-11-07 10:13:52 -08:00

asm-generic

asm-generic/unistd.h: support new process_vm_{readv,write} syscalls

2011-12-03 15:31:48 -05:00

crypto

crypto: Add a report function pointer to crypto_type

2011-10-21 14:24:03 +02:00

drm

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

2011-12-20 14:43:53 +00:00

keys

…

linux

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

2011-12-20 14:43:53 +00:00

math-emu

…

media

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

misc

[media] altera-stapl: it is time to move out from staging

2011-09-23 15:00:57 -03:00

mtd

mtd: kill old field for `struct mtd_info_user'

2011-09-11 15:57:44 +03:00

net

sch_red: fix red_calc_qavg_from_idle_time

2011-11-30 23:27:22 -05:00

pcmcia

pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3

2011-08-08 16:04:11 -04:00

rdma

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

2011-11-01 10:51:38 -07:00

rxrpc

…

scsi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2011-10-28 16:44:18 -07:00

sound

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

target

target: remove the unused se_dev_list

2011-12-06 06:00:57 +00:00

trace

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

video

ARM: OMAP: HWMOD: Unify DSS resets for OMAPs

2011-11-08 03:16:13 -07:00

xen

xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI

2011-11-16 12:13:42 -05:00

Kbuild

…