summaryrefslogtreecommitdiffstats
path: root/drivers/pci/iov.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-10-01 14:38:54 +0200
committerJiri Kosina <jkosina@suse.cz>2012-10-01 14:38:54 +0200
commitcdcd3ac4e945d1fcaef9907839569c2d70b2f3fa (patch)
tree46673a3c432958a4f712b064ddb9b645771cc0c3 /drivers/pci/iov.c
parenta3cbe10e474ac8c2c30a151a7812e15e4cfa2775 (diff)
parentf5ff4e1e62408327d27fb1e1ab00e96a52b7cd46 (diff)
downloadop-kernel-dev-cdcd3ac4e945d1fcaef9907839569c2d70b2f3fa.zip
op-kernel-dev-cdcd3ac4e945d1fcaef9907839569c2d70b2f3fa.tar.gz
Merge branch 'multitouch' into for-linus
Conflicts: drivers/hid/hid-multitouch.c
Diffstat (limited to 'drivers/pci/iov.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud