projects / platform / upstream / libdrm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0055fd5 e349b58)
Merge branch 'origin' into bo-set-pin
authorEric Anholt <eric@anholt.net>
Wed, 19 Sep 2007 22:55:58 +0000 (15:55 -0700)
committerEric Anholt <eric@anholt.net>
Wed, 19 Sep 2007 22:55:58 +0000 (15:55 -0700)
1  2 
linux-core/Makefile patch | diff1 | diff2 | blob | history
shared-core/drm.h patch | diff1 | diff2 | blob | history

diff --cc linux-core/Makefile
Simple merge
diff --cc shared-core/drm.h
Simple merge
Domain: System / Kernel;