Merge branches 'core', 'cxgb4', 'ip-roce', 'iser', 'misc', 'mlx4', 'nes', 'ocrdma', 'qib', 'sgwrapper', 'srp' and 'usnic' into for-next - sinitax/cachepc-linux - Fork of AMDESE/linux with modifications for CachePC side-channel attack

diff options

author	Roland Dreier <roland@purestorage.com>	2014-04-03 08:30:17 -0700
committer	Roland Dreier <roland@purestorage.com>	2014-04-03 08:30:17 -0700
commit	f7eaa7ed8fd46542275cf249cd934a366f6556bb (patch)
tree	1c5aa7dba073c1e8a2125075ccb01018404a5df2 /include
parent	2dea909444c294f55316c068906945ef38980ef3 (diff)
parent	96bb2706c883a21d7da6a261d7e60d3bab4cf6bd (diff)
parent	b2853fd6c2d0f383dbdf7427e263eb576a633867 (diff)
parent	5de2ad986d7e3626e37a024d7ad69dfd6ab13306 (diff)
parent	4661bd798f1b58ee2755bfa04003638345802680 (diff)
parent	0e9855dbf43a9cd31df5f5f61a18e031ac1c4a82 (diff)
parent	349850f0a9188cb87b4ef6c01c057cb42cca478e (diff)
parent	2d8f57d56f5850a75d6225519e77f75ad9949f25 (diff)
parent	186f8ba062f796221d51077342f3ba5202838e9f (diff)
parent	ea58a595657db88f55b5159442fdf0e34e1b4d95 (diff)
parent	b3fe628da2898cf1387105026dfed551ecc25de5 (diff)
parent	970918b32b030e9b3966e5ccb5f4a5a5b515a5b1 (diff)
download	cachepc-linux-f7eaa7ed8fd46542275cf249cd934a366f6556bb.tar.gz cachepc-linux-f7eaa7ed8fd46542275cf249cd934a366f6556bb.zip

Merge branches 'core', 'cxgb4', 'ip-roce', 'iser', 'misc', 'mlx4', 'nes', 'ocrdma', 'qib', 'sgwrapper', 'srp' and 'usnic' into for-next