Kirill A. Shutemov 699f0b45ce gma500: fix ioctl confict ...

Move DRM_GMA_GET_PIPE_FROM_CRTC_ID to 0x08 to avoid confict with
DRM_GMA_GEM_MMAP.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

2012-03-10 13:06:04 +00:00

..

acpi

Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release

2012-01-23 19:47:06 -05:00

asm-generic

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

crypto

crypto: serpent-sse2 - add lrw support

2011-11-21 16:13:24 +08:00

drm

gma500: fix ioctl confict

2012-03-10 13:06:04 +00:00

keys

keys: add a "logon" key type

2012-01-17 22:39:40 -06:00

linux

gma500: initial medfield merge

2012-03-10 13:05:48 +00:00

math-emu

…

media

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-01-18 12:53:54 -08:00

misc

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

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

mtd

mtd: document that MEMWRITE ioctl is NAND-specific

2012-01-09 18:18:36 +00:00

net

net/tcp: Fix tcp memory limits initialization when !CONFIG_SYSCTL

2012-01-30 12:41:06 -05:00

pcmcia

…

rdma

rdma/core: Fix sparse warnings

2012-01-04 09:17:45 -08:00

rxrpc

…

scsi

[SCSI] libfc: Declare local functions static

2012-01-16 12:45:48 +04:00

sound

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

2012-01-12 08:00:30 -08:00

target

target: Set additional sense length field in sense data

2011-12-16 06:29:04 +00:00

trace

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

2012-01-17 15:49:54 -08:00

video

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

xen

Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block

2012-01-15 12:48:41 -08:00

Kbuild

…