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)
commit3d3a96ad4e5596187236898ca241515a21661b69
tree89b2b0900cf02235741fa670e7947babc8959ebe
parent0055fd5c35306a6363b0414f7f2220b3d1c27ecc
parente349b58b4a6ebfe299720cb921039a600c145e65
Merge branch 'origin' into bo-set-pin
linux-core/Makefile
shared-core/drm.h