summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev/ppc4xx_gpio.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-08 21:20:54 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-08 21:20:54 +0200
commite467e104bb7482170b79f516d2025e7cfcaaa733 (patch)
treed9de9b008b2cec2e5f46e7bbc83cef50d3d5d288 /arch/powerpc/sysdev/ppc4xx_gpio.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff)
parentMerge branches 'cxgb4', 'ipoib' and 'qib' into for-next (diff)
downloadlinux-e467e104bb7482170b79f516d2025e7cfcaaa733.tar.xz
linux-e467e104bb7482170b79f516d2025e7cfcaaa733.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: IPoIB: Fix world-writable child interface control sysfs attributes IB/qib: Clean up properly if qib_init() fails IB/qib: Completion queue callback needs to be single threaded IB/qib: Update 7322 serdes tables IB/qib: Clear 6120 hardware error register IB/qib: Clear eager buffer memory for each new process IB/qib: Mask hardware error during link reset IB/qib: Don't mark VL15 bufs as WC to avoid a rare 7322 chip problem RDMA/cxgb4: Derive smac_idx from port viid RDMA/cxgb4: Avoid false GTS CIDX_INC overflows RDMA/cxgb4: Don't call abort_connection() for active connect failures RDMA/cxgb4: Use the DMA state API instead of the pci equivalents
Diffstat (limited to 'arch/powerpc/sysdev/ppc4xx_gpio.c')
0 files changed, 0 insertions, 0 deletions