summaryrefslogtreecommitdiffstats
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-01 20:01:54 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-01 20:01:54 +0100
commit4bc2a9bf8cbb63f3bb9797b2bf30b2316bd27a2b (patch)
treea02a03a4c75e3da0843168456124f60afae49200 /drivers/Makefile
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff)
parentMerge branches 'ehca' and 'mlx4' into for-linus (diff)
downloadlinux-4bc2a9bf8cbb63f3bb9797b2bf30b2316bd27a2b.tar.xz
linux-4bc2a9bf8cbb63f3bb9797b2bf30b2316bd27a2b.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: IB/mlx4: Fix MTT leakage in resize CQ IB/ehca: Fix problem with generated flush work completions IB/ehca: Change misleading error message on memory hotplug mlx4_core: Save/restore default port IB capability mask
Diffstat (limited to 'drivers/Makefile')
0 files changed, 0 insertions, 0 deletions