summaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-03 15:46:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-03 15:46:38 -0700
commit4aef77b2fe373cdba461925589b9d1d4468ee016 (patch)
tree96b27318a112e315eff3c38e77705bf9a6b5a174 /drivers/xen
parente0d23cdc626faef36900965c48dd8806df651f77 (diff)
parent04725ad59474d24553d526fa774179ecd2922342 (diff)
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull x86 IOSF platform updates from Ingo Molnar: "IOSF (Intel OnChip System Fabric) updates: - generalize the IOSF interface to allow mixed mode drivers: non-IOSF drivers to utilize of IOSF features on IOSF platforms. - add 'Quark X1000' IOSF/MBI support - clean up BayTrail and Quark PCI ID enumeration" * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, iosf: Add PCI ID macros for better readability x86, iosf: Add Quark X1000 PCI ID x86, iosf: Added Quark MBI identifiers x86, iosf: Make IOSF driver modular and usable by more drivers
Diffstat (limited to 'drivers/xen')
0 files changed, 0 insertions, 0 deletions