diff options
author | 2006-10-17 15:04:45 -0700 | |
---|---|---|
committer | 2006-10-17 15:04:45 -0700 | |
commit | acbb67d51ef0ff942d592d44fb8abb4c931041ff (patch) | |
tree | dcb18c0a192083632177b34610ed3457a68f4727 /arch/sh/kernel/process.c | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | IB/mthca: Use mmiowb after doorbell ring (diff) | |
download | wireguard-linux-acbb67d51ef0ff942d592d44fb8abb4c931041ff.tar.xz wireguard-linux-acbb67d51ef0ff942d592d44fb8abb4c931041ff.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: Use mmiowb after doorbell ring
IB/ipath: Initialize diagpkt file on device init only
RDMA/amso1100: Fix a NULL dereference in error path
RDMA/amso1100: pci_module_init() conversion
Diffstat (limited to 'arch/sh/kernel/process.c')
0 files changed, 0 insertions, 0 deletions