summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2012-12-202-428/+963
|\
| * rbd: get rid of rbd_{get,put}_dev()Alex Elder2012-12-201-12/+2
| * rbd: don't use ENOTSUPPAlex Elder2012-12-171-1/+1
| * rbd: get rid of RBD_MAX_SEG_NAME_LENAlex Elder2012-12-172-5/+3
| * rbd: do not allow remove of mounted-on imageAlex Elder2012-12-171-0/+13
| * rbd: get additional info in parent specAlex Elder2012-11-011-0/+133
| * rbd: get parent spec for version 2 imagesAlex Elder2012-11-011-0/+131
| * rbd: allow null image nameAlex Elder2012-11-011-1/+4
| * rbd: allow null image nameAlex Elder2012-11-011-0/+8
| * rbd: encapsulate last part of probeAlex Elder2012-11-011-75/+86
| * rbd: define rbd_dev_{create,destroy}() helpersAlex Elder2012-11-011-21/+41
| * rbd: consolidate rbd_dev init in rbd_add()Alex Elder2012-11-011-19/+18
| * rbd: don't pass rbd_dev to rbd_get_client()Alex Elder2012-11-011-18/+15
| * rbd: fill rbd_spec in rbd_add_parse_args()Alex Elder2012-11-011-38/+75
| * rbd: add reference counting to rbd_specAlex Elder2012-11-011-10/+42
| * rbd: define image specification structureAlex Elder2012-10-301-68/+90
| * rbd: have rbd_add_parse_args() return errorAlex Elder2012-10-301-17/+20
| * rbd: pass and populate rbd_options structureAlex Elder2012-10-301-11/+19
| * rbd: remove snap_name arg from rbd_add_parse_args()Alex Elder2012-10-301-13/+10
| * rbd: remove options args from rbd_add_parse_args()Alex Elder2012-10-301-29/+29
| * rbd: get rid of snap_name_lenAlex Elder2012-10-301-9/+4
| * rbd: do all argument parsing in one placeAlex Elder2012-10-301-40/+37
| * rbd: move ceph_parse_options() call upAlex Elder2012-10-301-21/+27
| * rbd: rename snap_exists fieldAlex Elder2012-10-301-6/+5
| * rbd: move snap info out of rbd_mapping structAlex Elder2012-10-301-14/+14
| * rbd: make pool_id a 64 bit valueAlex Elder2012-10-301-4/+4
| * rbd: remove snapshots on error in rbd_add()Alex Elder2012-10-301-9/+11
| * rbd: simplify rbd_rq_fn()Alex Elder2012-10-301-79/+152
| * rbd: kill rbd_device->rbd_optsAlex Elder2012-10-261-5/+9
| * rbd: simplify rbd_merge_bvec()Alex Elder2012-10-261-16/+35
| * rbd: increase maximum snapshot name lengthAlex Elder2012-10-261-5/+11
| * rbd: verify rbd image order valueAlex Elder2012-10-261-0/+10
| * rbd: consolidate rbd_do_op() callsAlex Elder2012-10-261-17/+9
| * rbd: drop rbd_do_op() opcode and flagsAlex Elder2012-10-261-7/+11
| * rbd: kill rbd_req_{read,write}()Alex Elder2012-10-261-47/+13
| * rbd: fix read-only option nameAlex Elder2012-10-261-1/+1
| * rbd: zero return code in rbd_dev_image_id()Alex Elder2012-10-261-0/+2
| * rbd: fix bug in rbd_dev_id_put()Alex Elder2012-10-261-2/+2
| * rbd: activate v2 image supportAlex Elder2012-10-101-1/+1
| * rbd: implement feature checksAlex Elder2012-10-101-1/+15
| * rbd: define rbd_dev_v2_refresh()Alex Elder2012-10-101-8/+47
| * rbd: define rbd_update_mapping_size()Alex Elder2012-10-101-11/+16
* | Merge tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2012-12-208-128/+215
|\ \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| *-------. \ Merge branches 'iommu/fixes', 'dma-debug', 'x86/amd', 'x86/vt-d', 'arm/tegra'...Joerg Roedel2012-12-1617-103/+966
| |\ \ \ \ \ \
| | | | | | * | iommu/omap: Adapt to runtime pmOmar Ramirez Luna2012-12-033-41/+19
| | | | | | * | iommu/omap: Migrate to hwmod frameworkOmar Ramirez Luna2012-12-032-24/+18
| | | | | | * | iommu/omap: Keep mmu enabled when requestedOmar Ramirez Luna2012-12-031-3/+0
| | | | | | * | iommu/omap: Remove redundant clock handling on ISROmar Ramirez Luna2012-12-031-2/+0
| | | | | | * | Merge branch 'omap-for-v3.8/cleanup-headers-iommu' of git://git.kernel.org/pu...Joerg Roedel2012-12-0312-14/+790
| | | | | | |\ \
| | | | | * | | | iommu/tegra: smmu: Move bus_set_iommu after probe for multi archHiroshi Doyu2012-11-281-1/+1