linux.git - Linux kernel mainline tree

diff options

author	Roland Dreier <roland@purestorage.com>	2014-01-22 23:24:13 -0800
committer	Roland Dreier <roland@purestorage.com>	2014-01-22 23:24:13 -0800
commit	8f399921ea9a562bc8221258c4b8a7bd69577939 (patch)
tree	0cd052e09d715df9bfe03b84f1fb124dacb282cc /drivers/infiniband/ulp
parent	5462eddd7a78131ccb514d52473625d99769215e (diff)
parent	298589b1cb626adf4beba6dd8e3cd4b64e8799be (diff)
parent	c1c98501121eefa0888a42566ec7233a1626f678 (diff)
parent	437708c44395a11e474fb33b4fd7f29483118e51 (diff)
parent	79adc5321e4dfe4df8ad19a805ed81c3b35c16dd (diff)
parent	af2e2e35a23e4aeecfe4332a7140c81e0f09b7e3 (diff)
parent	57761d8df8efc7cc1227f9bc22e0dda01b0dd91b (diff)
parent	be8348df6efac6b602f2ad3210139bccf0dbe3d7 (diff)
parent	6e0ea9e6cbcead7fa8c76e3e3b9de4a50c5131c5 (diff)
parent	0c7f82189d2249153ee302fe4d02de15f165d220 (diff)
parent	a384b20e417ae0f5f1f359600b4bdcc34265b256 (diff)
download	linux-8f399921ea9a562bc8221258c4b8a7bd69577939.tar.gz linux-8f399921ea9a562bc8221258c4b8a7bd69577939.tar.bz2 linux-8f399921ea9a562bc8221258c4b8a7bd69577939.zip

Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next