summaryrefslogtreecommitdiffstats
path: root/drivers/vfio
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-11 06:47:50 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-11 06:47:50 -0400
commite98d6e7f7625ed60c7bc1d39aeb2375ed3918fd5 (patch)
treebc6e9a6428229d2fca73e1447b5cbfe59866c4b4 /drivers/vfio
parent4e0b7fe38345b81930363b9f1b4b324181ddcc9e (diff)
parent2118f4b8dfc666c3e4a9e262beca79636a0852fe (diff)
downloadlinux-e98d6e7f7625ed60c7bc1d39aeb2375ed3918fd5.tar.bz2
Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux
Pull devicetree changes from Grant Likely: "This branch contains bug fixes and new features for the devicetree code. Most of the changes are either new testcases for the selftest code or documentation changes. The most notable change is the addition of a phandle resolver for use when grafting in a second device tree blob into the core tree. The resolver isn't currently used by anything other than the selftest module, but it will be used to support device tree overlays; probably in the v3.19 timeframe. Also note that I've moved my normal tree from git.secretlab.ca to git.kernel.org" * tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux: of/selftest: Move hash table off stack to fix large frame size To remove non-ascii characters in of_selftest.txt of/selftest: Use the resolver to fixup phandles of: Introduce Device Tree resolve support. of/selftest: Add a test for duplicate phandles of: Don't try to search when phandle == 0 of/selftest: Test structure of device tree of: Fix NULL dereference in selftest removal code of: add vendor prefix for Chipidea of: Add vendor prefix for Innolux Corporation of: Add vendor prefix for Sitronix devicetree: bindings: Document Gateworks vendor prefix of: Add vendor prefix for Energy Micro dt/documentation: add specification of dma bus information
Diffstat (limited to 'drivers/vfio')
0 files changed, 0 insertions, 0 deletions