diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 19:44:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 19:44:34 -0400 |
| commit | 75f5076b12924f53340209d2cde73b98ed3b3095 (patch) | |
| tree | 82bad4b458c0a7e54d264d407de12390275a1b24 /arch/blackfin/kernel/time.c | |
| parent | 83d7e948754cf021ed7343b122940fcc27c1bd88 (diff) | |
| parent | 1df9fad1220beb21b4b4230373cbf4924436dd88 (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: Use pci_dev->revision
RDMA/iwcm: Get rid of enum iw_cm_event_status
IB/ipath: Use pci_dev->revision, again
IB/qib: Prevent driver hang with unprogrammed boards
RDMA/cxgb4: EEH errors can hang the driver
RDMA/cxgb4: Reset wait condition atomically
RDMA/cxgb4: Fix missing parentheses
RDMA/cxgb4: Initialization errors can cause crash
RDMA/cxgb4: Don't change QP state outside EP lock
RDMA/cma: Add an ID_REUSEADDR option
RDMA/cma: Fix handling of IPv6 addressing in cma_use_port
Diffstat (limited to 'arch/blackfin/kernel/time.c')
0 files changed, 0 insertions, 0 deletions