Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next - linux - Linux Kernel (branches are rebased on master from time to time)

diff options

author	Roland Dreier <roland@purestorage.com>	2014-06-10 10:12:14 -0700
committer	Roland Dreier <roland@purestorage.com>	2014-06-10 10:12:14 -0700
commit	eeaddf3670d4974e17268ec78a576ad397e2dcd9 (patch)
tree	3b06b0dc4a1b6d9b2d1e289adaaf68c52f8a85d7 /drivers/infiniband/hw/usnic
parent	60e1751cb52cc6d1ae04b6bd3c2b96e770b5823f (diff)
parent	3c735d481b9a507dccee63eeaf6aa6ffa2bccc67 (diff)
parent	b7dfa8895f64ffa371d0ed09c1d1ba8c6e19b956 (diff)
parent	c7ca4b69d9ac8ec22f7c6b37a1ab9ac910c726cd (diff)
parent	9eccfe109b276fddf2908d1a70f7f4449b92f08f (diff)
parent	8385fd841468868e0b37a722530d75b0e8bfc5a8 (diff)
parent	165cb465f73c33c4fb9a79951a623083291c6f1e (diff)
parent	6c9b5d9b00ed2b1cbd5e5d2c176bf88da7beb224 (diff)
parent	6fcd8d0d93fb2f38807371bb144f3f869d4ca5a2 (diff)
parent	0cc65dd6918f529ae2c19be95b86dec19549b7ed (diff)
parent	0a66d2bd300cbdaa3146c81cb823d01593963066 (diff)
parent	d236cd0e209c595434ba15defe56f2e5aa488d1a (diff)
parent	ed477c4c83b31ebc2b143382b0b5d70325fc9643 (diff)
download	linux-eeaddf3670d4974e17268ec78a576ad397e2dcd9.tar.bz2

Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next