diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 23:45:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 23:45:48 +0100 |
| commit | 6845a44a314c0c626549de373131bf108f9cc1f1 (patch) | |
| tree | 9152a5c557434515dd7306d288e8f55ecc64652e /arch/arm/mach-omap1/time.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
| parent | Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-next (diff) | |
| download | linux-6845a44a314c0c626549de373131bf108f9cc1f1.tar.xz linux-6845a44a314c0c626549de373131bf108f9cc1f1.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: Update workqueue usage
RDMA/nes: Fix incorrect SFP+ link status detection on driver init
RDMA/nes: Fix SFP+ link down detection issue with switch port disable
RDMA/nes: Generate IB_EVENT_PORT_ERR/PORT_ACTIVE events
RDMA/nes: Fix bonding on iw_nes
IB/srp: Test only once whether iu allocation succeeded
IB/mlx4: Handle protocol field in multicast table
RDMA: Use vzalloc() to replace vmalloc()+memset(0)
mlx4_{core, ib, en}: Fix driver when sizeof (phys_addr_t) > sizeof (long)
IB/mthca: Fix driver when sizeof (phys_addr_t) > sizeof (long)
Diffstat (limited to 'arch/arm/mach-omap1/time.c')
0 files changed, 0 insertions, 0 deletions