summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nv04_cursor.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-04-26 10:54:48 +0400
committerPaul Mundt <lethal@linux-sh.org>2010-04-26 10:54:48 +0400
commit35f6cd4a06432034665a1499ca4b022437423aac (patch)
treeea565196d6db2ed80780639701fc0b74748bf90c /drivers/gpu/drm/nouveau/nv04_cursor.c
parent5bac942db3d2c4738df04104240d65a5d1eaec6a (diff)
parent035ca59fe8399a67b56511bd5b28130f0c4874a0 (diff)
downloadlinux-35f6cd4a06432034665a1499ca4b022437423aac.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming/sh-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming/sh-2.6: sh: Use correct mask when comparing PMB DATA array values sh: Do not try merging two 128MB PMB mappings sh: Fix zImage load address when CONFIG_32BIT=y sh: Fix address to decompress at when CONFIG_32BIT=y sh: Assembly friendly __pa and __va definitions
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_cursor.c')
0 files changed, 0 insertions, 0 deletions