summaryrefslogtreecommitdiff
path: root/drivers/video/cg6.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-13 18:16:49 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-13 18:16:49 -0700
commitd773b33972a663cfaf066e966f87922a74088a1e (patch)
treec19f978f2c9a1be0d7a416eabe217f627392e383 /drivers/video/cg6.c
parentac3f5753ea37d55c85aaf96211c13038fcc69aef (diff)
parentb027cacdabc3ffe2d2b97a55375203add64a5d29 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: mlx4_core: Fix infinite loop on device initialization
Diffstat (limited to 'drivers/video/cg6.c')
0 files changed, 0 insertions, 0 deletions