summaryrefslogtreecommitdiff
path: root/linux-core/xgi_fb.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@panoply-rh.(none)>2008-03-05 10:37:02 +1000
committerDave Airlie <airlied@panoply-rh.(none)>2008-03-05 10:37:02 +1000
commit43891ff2d0176f013796b3c2a340b7d379d703ee (patch)
tree734cdcd6e6c36997f1db92d41b92e4557ebf13b1 /linux-core/xgi_fb.c
parent81db48536c9d7bb23c448af6a6f1de81df755585 (diff)
parenta6a2f2c8c491617de702dc7d62bb55cbada4d42b (diff)
Merge remote branch 'origin/master' into modesetting-101
Conflicts: linux-core/drm_compat.c
Diffstat (limited to 'linux-core/xgi_fb.c')
0 files changed, 0 insertions, 0 deletions