]> err.no Git - linux-2.6/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jul 2008 21:16:23 +0000 (14:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jul 2008 21:16:23 +0000 (14:16 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/cxgb3: Fix regression caused by class_device -> device conversion


Trivial merge