summaryrefslogtreecommitdiffstats
path: root/net/x25/af_x25.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-09 20:53:06 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-09 20:53:06 +0200
commit0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (patch)
tree83855363f7be25305477dca09a91166deb376354 /net/x25/af_x25.c
parentMerge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff)
parentMerge branches 'cma', 'misc', 'mlx4' and 'nes' into for-linus (diff)
downloadlinux-0eddb519b9127c73d53db4bf3ec1d45b13f844d1.tar.xz
linux-0eddb519b9127c73d53db4bf3ec1d45b13f844d1.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/mlx4: Check correct variable for allocation failure RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp() RDMA/cm: Set num_paths when manually assigning path records IB/cm: Fix device_create() return value check
Diffstat (limited to 'net/x25/af_x25.c')
0 files changed, 0 insertions, 0 deletions