summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mm: delete various needless include <linux/module.h>Paul Gortmaker2011-10-316-6/+0
* range: fix bogus misuse of module.h to get printk()Paul Gortmaker2011-10-311-1/+1
* module.h: relocate MODULE_PARM_DESC into moduleparam.hPaul Gortmaker2011-10-312-5/+5
* module.h: split out the EXPORT_SYMBOL into export.hPaul Gortmaker2011-10-312-67/+90
* Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-10-306-17/+46
|\
| * i2c: Functions for byte-swapped smbus_write/read_word_dataJonathan Cameron2011-10-302-0/+25
| * i2c-algo-pca: Return standard fault codesJean Delvare2011-10-301-2/+4
| * i2c-algo-bit: Return standard fault codesJean Delvare2011-10-301-7/+7
| * i2c-algo-bit: Be verbose on bus testing failureJean Delvare2011-10-301-1/+3
| * i2c-algo-bit: Let user test buses without failingJean Delvare2011-10-301-3/+3
| * i2c/scx200_acb: Fix section mismatch warning in scx200_pci_drvHarvey Yang2011-10-301-3/+3
| * i2c: I2C_ELEKTOR should depend on HAS_IOPORTGeert Uytterhoeven2011-10-301-1/+1
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommuLinus Torvalds2011-10-3028-647/+869
|\ \
| | \
| | \
| | \
| | \
| | \
| | \
| *-----. \ Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', '...Joerg Roedel2011-10-2128-647/+869
| |\ \ \ \ \
| | | | | * | iommu/core: Remove global iommu_ops and register_iommuJoerg Roedel2011-10-212-24/+4
| | | | | * | iommu/msm: Use bus_set_iommu instead of register_iommuJoerg Roedel2011-10-211-1/+1
| | | | | * | iommu/omap: Use bus_set_iommu instead of register_iommuJoerg Roedel2011-10-211-1/+1
| | | | | * | iommu/vt-d: Use bus_set_iommu instead of register_iommuJoerg Roedel2011-10-211-1/+1
| | | | | * | iommu/amd: Use bus_set_iommu instead of register_iommuJoerg Roedel2011-10-211-1/+1
| | | | | * | iommu/core: Use bus->iommu_ops in the iommu-apiJoerg Roedel2011-10-211-7/+27
| | | | | * | iommu/core: Convert iommu_found to iommu_presentJoerg Roedel2011-10-215-8/+13
| | | | | * | iommu/core: Add bus_type parameter to iommu_domain_allocJoerg Roedel2011-10-214-5/+19
| | | | | * | Driver core: Add iommu_ops to bus_typeJoerg Roedel2011-10-213-0/+39
| | | | | * | iommu/core: Define iommu_ops and register_iommu only with CONFIG_IOMMU_APIJoerg Roedel2011-10-211-5/+3
| | | | | | |
| | | | | | \
| | | | | | \
| | | | | | \
| | | | | *---. \ Merge branches 'debug/dma-api', 'arm/omap', 'arm/msm' and 'core' into api-2Joerg Roedel2011-09-06363-2383/+3677
| | | | | |\ \ \ \
| | | | | | | | * | iommu/core: Use PAGE_SIZE instead of hard-coded valueJoerg Roedel2011-09-061-2/+2
| | | | | | | | * | iommu/core: use the existing IS_ALIGNED macroOhad Ben-Cohen2011-09-051-6/+3
| | | | | | | * | | iommu/msm: ->unmap() should return order of unmapped pageOhad Ben-Cohen2011-09-051-0/+7
| | | | | * | | | | dma-debug: hash_bucket_find needs to allow for offsets within an entryNeil Horman2011-08-231-7/+61
| | | | * | | | | | iommu/core: let drivers know if an iommu fault handler isn't installedOhad Ben-Cohen2011-09-302-1/+11
| | | | * | | | | | iommu/core: export iommu_set_fault_handler()Ohad Ben-Cohen2011-09-261-0/+1
| | | | * | | | | | iommu/omap: Migrate to the generic fault report mechanismOhad Ben-Cohen2011-09-142-30/+4
| | | | * | | | | | iommu/core: Add fault reporting mechanismOhad Ben-Cohen2011-09-142-0/+64
| | | | | |/ / / / | | | | |/| | | |
| | | * | | | | | iommu/omap: always provide iommu debug codeArnd Bergmann2011-10-101-1/+1
| | | * | | | | | iommu/omap: Fix build error with !IOMMU_SUPPORTJoerg Roedel2011-09-142-4/+3
| | | |/ / / / /
| | | * | | | | iommu/omap: ->unmap() should return order of unmapped pageOhad Ben-Cohen2011-09-052-10/+5
| | | * | | | | iommu/omap: cleanup: remove a redundant statementOhad Ben-Cohen2011-09-051-4/+2
| | | * | | | | iommu/omap-iovmm: support non page-aligned buffers in iommu_vmapLaurent Pinchart2011-09-051-10/+26
| | | * | | | | iommu: omap: add Kconfig OMAP dependencyOhad Ben-Cohen2011-08-291-0/+1
| | | * | | | | omap: iommu: Fix up mutex->spin_lock conversion of iommu_lockJoerg Roedel2011-08-261-3/+3
| | | * | | | | omap: iommu: omapify 'struct iommu' and exposed APIOhad Ben-Cohen2011-08-2613-189/+208
| | | * | | | | omap: iommu: remove unused exported APIOhad Ben-Cohen2011-08-262-62/+0
| | | * | | | | omap: iovmm: remove unused functionalityOhad Ben-Cohen2011-08-262-209/+0
| | | * | | | | omap: iommu: PREFETCH_IOTLB cleanupOhad Ben-Cohen2011-08-261-3/+16
| | | * | | | | omap: iommu: stop exporting local functionsOhad Ben-Cohen2011-08-262-20/+7
| | | * | | | | omap: iommu/iovmm: move to dedicated iommu folderOhad Ben-Cohen2011-08-269-20/+25
| | | * | | | | omap: iommu: migrate to the generic IOMMU APIOhad Ben-Cohen2011-08-2611-125/+422
| | | |/ / / /
| | * | | | | iommu/amd: Fix wrong shift directionJoerg Roedel2011-10-111-1/+1
* | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bpLinus Torvalds2011-10-303-45/+44
|\ \ \ \ \ \ \
| * | | | | | | amd64_edac: Cleanup return type of amd64_determine_edac_cap()Dan Carpenter2011-10-061-2/+2
OpenPOWER on IntegriCloud