Dave Airlie
017ed8012e
Merge tag 'v3.1-rc10' into drm-core-next
...
There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_asic.h
2011-10-18 10:54:30 +01:00
..
acpi
Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2011-08-03 21:53:27 -10:00
asm-generic
All Arch: remove linkage for sys_nfsservctl system call
2011-08-26 15:09:58 -07:00
crypto
drm
Merge branch 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux into drm-core-next
2011-10-10 20:05:21 +01:00
keys
linux
Merge branch 'for-linus' of http://people.redhat.com/agk/git/linux-dm
2011-10-06 08:31:47 -07:00
math-emu
media
mtd
net
tcp: fix build error if !CONFIG_SYN_COOKIES
2011-09-18 21:48:01 -04:00
pcmcia
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2011-07-31 06:23:08 -10:00
rdma
rxrpc
scsi
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
2011-08-06 22:56:03 -07:00
sound
ASoC: omap: Update e-mail address of Jarkko Nikula
2011-08-12 11:45:10 +09:00
target
target: Make standard INQUIRY return 'not connected' for tpg_virt_lun0
2011-08-22 19:25:35 +00:00
trace
writeback: show raw dirtied_when in trace writeback_single_inode
2011-08-31 08:48:15 +08:00
video
xen
Kbuild