summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-26 03:57:25 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-26 03:57:25 +0100
commit840f51ffe126123e748df0f36c411a90db1efd93 (patch)
tree81a25939a99b9255777ca447cebc95b6385e61c3 /include/drm
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentsparc64: Fix IRQ ->set_affinity() methods. (diff)
downloadlinux-840f51ffe126123e748df0f36c411a90db1efd93.tar.xz
linux-840f51ffe126123e748df0f36c411a90db1efd93.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix IRQ ->set_affinity() methods. sparc: cpumask_of_node() should handle -1 as a node sparc64: Update defconfig. sparc: Add missing SW perf fault events. sparc64: Fully support both performance counters. sparc64: Add perf callchain support. sparc: convert to arch_gettimeoffset() sparc: leds_resource.end assigned to itself in clock_board_probe() sparc32: Fix page_to_phys(). sparc: Simplify param.h by simply including <asm-generic/param.h> sparc32: Update defconfig. SPARC: use helpers for rlimits sparc: copy_from_user() should not return -EFAULT
Diffstat (limited to 'include/drm')
0 files changed, 0 insertions, 0 deletions