projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
45beca0
5a125c3
)
Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 3 Nov 2008 17:58:40 +0000
(09:58 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 3 Nov 2008 17:58:40 +0000
(09:58 -0800)
* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
i915: Add GEM ioctl to get available aperture size.
drm/radeon: fixup further bus mastering confusion.
build fix: CONFIG_DRM_I915=y && CONFIG_ACPI=n
Trivial merge