]> err.no Git - linux-2.6/commit
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)
commit6329d3021bcfa9038621e6e917d98929421d8ec8
treec00f4b92ba8eaa433db8aea989bfe1b5a6cf074f
parentb72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3
parent5e19cf663be534c7c15a35a86fa7ddc9f797e4f4
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:
  RDMA/cxgb3: Fix regression caused by class_device -> device conversion