summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv40_fb.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 12:06:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 12:06:02 -0700
commit0d66cba1ac3ad38614077443d604d6a09cec99de (patch)
tree383981fd93c7e6d467fb239edd51f935f1a481dd /drivers/gpu/drm/nouveau/nv40_fb.c
parent4637f40f200063973553ce3c4c1ac6c247e4535c (diff)
parent5bd418784a2764a8d9de177a5462bfc008fd334a (diff)
downloadlinux-0d66cba1ac3ad38614077443d604d6a09cec99de.tar.gz
linux-0d66cba1ac3ad38614077443d604d6a09cec99de.tar.bz2
linux-0d66cba1ac3ad38614077443d604d6a09cec99de.zip
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (29 commits) [S390] cpu hotplug: fix external interrupt subclass mask handling [S390] oprofile: dont access lowcore [S390] oprofile: add missing irq stats counter [S390] Ignore sendmmsg system call note wired up warning [S390] s390,oprofile: fix compile error for !CONFIG_SMP [S390] s390,oprofile: fix alert counter increment [S390] Remove unused includes in process.c [S390] get CPC image name [S390] sclp: event buffer dissection [S390] chsc: process channel-path-availability information [S390] refactor page table functions for better pgste support [S390] merge page_test_dirty and page_clear_dirty [S390] qdio: prevent compile warning [S390] sclp: remove unnecessary sendmask check [S390] convert old cpumask API into new one [S390] pfault: cleanup code [S390] pfault: cpu hotplug vs missing completion interrupts [S390] smp: add __noreturn attribute to cpu_die() [S390] percpu: implement arch specific irqsafe_cpu_ops [S390] vdso: disable gcov profiling ...
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv40_fb.c')
0 files changed, 0 insertions, 0 deletions