diff options
| author | Linus Torvalds | 2008-08-08 03:14:07 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-08-08 03:14:07 +0200 |
| commit | 273b2578392bbf6e5c47a8a3d1ee461ce6fc7182 (patch) | |
| tree | 1b00bd21574b1f8db084be4f682d7251a3a0ff3e /drivers/watchdog/omap_wdt.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| parent | Merge branches 'cma', 'cxgb3', 'ipath', 'ipoib', 'mad' and 'mlx4' into for-linus (diff) | |
| download | kernel-qcow2-linux-273b2578392bbf6e5c47a8a3d1ee461ce6fc7182.tar.gz kernel-qcow2-linux-273b2578392bbf6e5c47a8a3d1ee461ce6fc7182.tar.xz kernel-qcow2-linux-273b2578392bbf6e5c47a8a3d1ee461ce6fc7182.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/mad: Test ib_create_send_mad() return with IS_ERR(), not == NULL
IB/mlx4: Allow 4K messages for UD QPs
mlx4_core: Add ethernet fields to CQE struct
IB/ipath: Fix printk format warnings
RDMA/cxgb3: Fix deadlock initializing iw_cxgb3 device
RDMA/cxgb3: Fix up MW access rights
RDMA/cxgb3: Fix QP capabilities
RDMA/cma: Remove padding arrays by using struct sockaddr_storage
IB/ipath: Use unsigned long for irq flags
IPoIB/cm: Set correct SG list in ipoib_cm_init_rx_wr()
Diffstat (limited to 'drivers/watchdog/omap_wdt.c')
0 files changed, 0 insertions, 0 deletions