summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-20 00:13:53 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-20 00:13:53 +0100
commit511585a28e5b5fd1cac61e601e42efc4c5dd64b5 (patch)
treed3205b45d9666a621359098e6d9a5723b4c2660a /arch/xtensa
parentMerge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentMerge branches 'cma', 'mlx4' and 'qib' into for-next (diff)
downloadlinux-511585a28e5b5fd1cac61e601e42efc4c5dd64b5.tar.xz
linux-511585a28e5b5fd1cac61e601e42efc4c5dd64b5.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/qib: Correct sense on freectxts increment and decrement RDMA/cma: Verify private data length IB/mlx4: Fix shutdown crash accessing a non-existent bitmap
Diffstat (limited to 'arch/xtensa')
0 files changed, 0 insertions, 0 deletions