summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
*-----. 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
* | | | | Linux 3.1-rc10v3.1-rc10Linus Torvalds2011-10-181-1/+1
* | | | | Avoid using variable-length arrays in kernel/sys.cLinus Torvalds2011-10-171-1/+1
* | | | | Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-...Linus Torvalds2011-10-164-3/+11
|\ \ \ \ \
| * | | | | ARM: 7128/1: vic: Don't write to the read-only register VIC_IRQ_STATUSZoltan Devai2011-10-151-1/+0
| * | | | | ARM: 7122/1: localtimer: add header linux/errno.h explicitlyShawn Guo2011-10-151-0/+2
| * | | | | ARM: 7117/1: perf: fix HW_CACHE_* events on Cortex-A9Will Deacon2011-10-151-2/+2
| * | | | | ARM: 7113/1: mm: Align bank start to MAX_ORDER_NR_PAGESLinus Walleij2011-10-011-0/+7
* | | | | | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2011-10-141-4/+11
|\ \ \ \ \ \
| * | | | | | hwmon: (w83627ehf) Properly report thermal diode sensorsJean Delvare2011-10-141-4/+11
* | | | | | | Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-10-142-1/+2
|\ \ \ \ \ \ \
| * | | | | | | gpio-pca953x: fix gpio_baseHartmut Knaack2011-10-131-0/+1
| * | | | | | | gpio/omap: fix build error with certain OMAP1 configsJanusz Krzysztofik2011-10-131-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfsLinus Torvalds2011-10-148-62/+69
|\ \ \ \ \ \ \
| * | | | | | | xfs: revert to using a kthread for AIL pushingChristoph Hellwig2011-10-114-51/+45
| * | | | | | | xfs: force the log if we encounter pinned buffers in .iop_pushbufChristoph Hellwig2011-10-115-10/+24