projects
/
profile
/
ivi
/
libdrm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2bafeb6
4175dd8
)
Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2
author
Ian Romanick
<idr@us.ibm.com>
Thu, 26 Jul 2007 23:58:28 +0000
(16:58 -0700)
committer
Ian Romanick
<idr@us.ibm.com>
Thu, 26 Jul 2007 23:58:28 +0000
(16:58 -0700)
Conflicts:
linux-core/drmP.h
linux-core/drm_scatter.c
1
2
linux-core/Makefile.kernel
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
linux-core/Makefile.kernel
Simple merge