aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/mlx4/alias_GUID.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2012-10-13 20:25:19 +0000
committerLinus Torvalds <[email protected]>2012-10-13 20:25:19 +0000
commit7c5a47346989e43ba34a9c94a55cc0aef7ed6b3b (patch)
tree1270a325328c306ae1f462d77008ec885231594b /drivers/infiniband/hw/mlx4/alias_GUID.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi... (diff)
parentMerge tag 'disintegrate-openrisc-20121009' of git://git.infradead.org/users/d... (diff)
downloadkernel-7c5a47346989e43ba34a9c94a55cc0aef7ed6b3b.tar.gz
kernel-7c5a47346989e43ba34a9c94a55cc0aef7ed6b3b.zip
Merge tag 'openrisc-uapi' of git://openrisc.net/jonas/linux
Pull OpenRISC uapi disintegration from Jonas Bonn: "OpenRISC UAPI disintegration work from David Howells" * tag 'openrisc-uapi' of git://openrisc.net/jonas/linux: UAPI: (Scripted) Disintegrate arch/openrisc/include/asm
Diffstat (limited to 'drivers/infiniband/hw/mlx4/alias_GUID.c')
0 files changed, 0 insertions, 0 deletions