diff options
author | Linus Torvalds | 2008-07-09 23:16:23 +0200 |
---|---|---|
committer | Linus Torvalds | 2008-07-09 23:16:23 +0200 |
commit | 6329d3021bcfa9038621e6e917d98929421d8ec8 (patch) | |
tree | c00f4b92ba8eaa433db8aea989bfe1b5a6cf074f /fs/ocfs2 | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | RDMA/cxgb3: Fix regression caused by class_device -> device conversion (diff) | |
download | kernel-qcow2-linux-6329d3021bcfa9038621e6e917d98929421d8ec8.tar.gz kernel-qcow2-linux-6329d3021bcfa9038621e6e917d98929421d8ec8.tar.xz kernel-qcow2-linux-6329d3021bcfa9038621e6e917d98929421d8ec8.zip |
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
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions