summaryrefslogtreecommitdiff
path: root/arch/mn10300/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-19 15:50:11 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-19 15:50:11 -0800
commite855e5d82edd708bcb966cf7ccda2dee1c154935 (patch)
treea0efdf7a61329b2bae35e0ee61a94afe5f1eeeb2 /arch/mn10300/kernel
parent37c514e3dfc8f55145d9c6895e2838ac31859aa4 (diff)
parentb7f9c112a5e7f68d77a31c79f5942a3272ae9a3b (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/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')
0 files changed, 0 insertions, 0 deletions