summaryrefslogtreecommitdiffstats
path: root/net/tipc/server.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-07 11:08:13 +0800
committerMark Brown <broonie@linaro.org>2014-03-07 11:08:13 +0800
commitd930acfdb021f9d61e156c4f53d42043305f5bf6 (patch)
treeee99b27fd9df22457682fc41912c98a78ec77ba5 /net/tipc/server.c
parent0414855fdc4a40da05221fc6062cccbc0c30f169 (diff)
parent61d1cf163c8653934cc8cd5d0b2a562d0990c265 (diff)
parentba938f3a295686aa9ab5077b10d1049f8091cbd7 (diff)
parentee73b4c6e3fc0755a91752ab8eebc8e070038b53 (diff)
parent017145fef567430789e40f6a22a90ce2a766370b (diff)
parentfd40dccb1a170ba689664481a3de83617b7194d2 (diff)
parent7995d74ab297e4f5526c8df70007e1e39f0d1f5c (diff)
downloadlinux-d930acfdb021f9d61e156c4f53d42043305f5bf6.tar.bz2
Merge remote-tracking branches 'spi/fix/ath79', 'spi/fix/atmel', 'spi/fix/coldfire', 'spi/fix/fsl-dspi', 'spi/fix/imx' and 'spi/fix/topcliff-pch' into spi-linus