aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/attribute_container.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-23 23:19:31 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-23 23:19:31 -0500
commit9b82e65d65c90faecc408bcdc14a0229736ed193 (patch)
tree2cf5fd4f4df01c6488afd0046325405381a73e36 /drivers/base/attribute_container.c
parent8174a06eba10a43375d1dd6f74c58a71519e3be5 (diff)
parente6af578c5305be693a1bc7f4dc7b51dd82d41425 (diff)
Merge git://github.com/rustyrussell/linux
* git://github.com/rustyrussell/linux: virtio-pci: make reset operation safer virtio-mmio: Correct the name of the guest features selector virtio: add HAS_IOMEM dependency to MMIO platform bus driver
Diffstat (limited to 'drivers/base/attribute_container.c')
0 files changed, 0 insertions, 0 deletions