summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx/miccpt-pci.c
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-05-21 18:00:47 +0200
committerRoland Dreier <roland@purestorage.com>2012-05-21 18:00:47 +0200
commitcc169165c82e14ea43e313f937a0a475ca97e588 (patch)
tree519721cccd2d91ecba43ef4f8879021c8858d8b7 /arch/arm/mach-ixp4xx/miccpt-pci.c
parentIB/core: Fix IB_SA_COMP_MASK macro (diff)
parentRDMA/cxgb4: Include vmalloc.h for vmalloc and vfree (diff)
parentIB/ipath: Replace open-coded ARRAY_SIZE with macro (diff)
parentIB/iser: Fix error flow in iser ep connection establishment (diff)
parentRDMA/cma: Fix lockdep false positive recursive locking (diff)
parentIB/mlx4: Fix mlx4_ib_add() error flow (diff)
parentRDMA/nes: Don't call event handler if pointer is NULL (diff)
parentRDMA/ocrdma: Fix build with IPV6=n (diff)
parentIB/qib: Add cache line awareness to qib_qp and qib_devdata structures (diff)
parentIB/mlx4: Add raw packet QP support (diff)
downloadlinux-cc169165c82e14ea43e313f937a0a475ca97e588.tar.xz
linux-cc169165c82e14ea43e313f937a0a475ca97e588.zip
Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma', 'qib' and 'raw-qp' into for-linus