| commit | 3e9345edd8562dc4f9bbca88a598c91c8779a9c4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 30 09:12:16 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 30 09:12:16 2010 -0700 |
| tree | 01d91aee420251b164e54f850e24ae12aceccab9 | |
| parent | d28619f1563140526e2f84eae436f39206f40a69 [diff] | |
| parent | 767dcd42e51c69be88f83683eda7883e522618fa [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: IB/qib: Remove DCA support until feature is finished IB/qib: Use a single txselect module parameter for serdes tuning IB/qib: Don't rely on (undefined) order of function parameter evaluation IB/ucm: Use memdup_user() IB/qib: Fix undefined symbol error when CONFIG_PCI_MSI=n