diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-21 13:36:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-21 13:36:06 -0400 |
| commit | e08f6d4131ab964420f0bcabecc68d75fb49df79 (patch) | |
| tree | e1d2116899c4e0240d0c5ae4507f67ab801c91ee /kernel/time/alarmtimer.c | |
| parent | 890879cfa08f5ceaa09810611f46e890f7d57ff6 (diff) | |
| parent | c7d74b090913102e7917dd02bb574ef060e1e930 (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: Ensure that LOS and DFE are being turned off
RDMA/cxgb4: Couple of abort fixes
RDMA/cxgb4: Don't truncate MR lengths
RDMA/cxgb4: Don't exceed hw IQ depth limit for user CQs
Diffstat (limited to 'kernel/time/alarmtimer.c')
0 files changed, 0 insertions, 0 deletions