Merge branch 'master' into bo-set-pin
authorEric Anholt <eric@anholt.net>
Thu, 16 Aug 2007 16:23:09 +0000 (09:23 -0700)
committerEric Anholt <eric@anholt.net>
Thu, 16 Aug 2007 16:23:09 +0000 (09:23 -0700)
commit0055fd5c35306a6363b0414f7f2220b3d1c27ecc
tree40178e87d98efeb4bd9e0030b989a31e2090b9c9
parent3a0bc518e35c62bb9c64c9105f836584d949653f
parent02c4e0e757b69cd6ae38b8ab2c078b3f06fea661
Merge branch 'master' into bo-set-pin
linux-core/drm_bo.c
linux-core/drm_drv.c
linux-core/drm_objects.h