diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-20 00:50:11 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-20 00:50:11 +0100 |
commit | e855e5d82edd708bcb966cf7ccda2dee1c154935 (patch) | |
tree | a0efdf7a61329b2bae35e0ee61a94afe5f1eeeb2 /arch/mn10300/kernel/time.c | |
parent | Add missing init section definitions (diff) | |
parent | IB/mthca: Free correct MPT on error exit from mthca_fmr_alloc() (diff) | |
download | linux-e855e5d82edd708bcb966cf7ccda2dee1c154935.tar.xz linux-e855e5d82edd708bcb966cf7ccda2dee1c154935.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/mthca: Free correct MPT on error exit from mthca_fmr_alloc()
IPoIB/cm: Fix ipoib_cm_dev_stop() cleanup when drain times out
Diffstat (limited to 'arch/mn10300/kernel/time.c')
0 files changed, 0 insertions, 0 deletions