summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-26 17:19:30 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-26 17:19:30 -0800
commit4cbd55188fe01f22783815cbb6d4f55a0ebf5969 (patch)
treecbefb228c717bc53542452b44d5349c3665845ee /drivers/gpu/Makefile
parentb305956abc3c50c52598bbf39b7a5f4850058ba8 (diff)
parentb6fa8796b2da0390e9f4115e8789a01004fc1c9b (diff)
downloadop-kernel-dev-4cbd55188fe01f22783815cbb6d4f55a0ebf5969.zip
op-kernel-dev-4cbd55188fe01f22783815cbb6d4f55a0ebf5969.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: dlm: use bastmode in debugfs output dlm: Send lockspace name with uevents dlm: send reply before bast dlm: fix ordering of bast and cast
Diffstat (limited to 'drivers/gpu/Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud