| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu | Linus Torvalds | 2011-10-30 | 15 | -60/+2589 |
|\ |
|
| *-----. | Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', '... | Joerg Roedel | 2011-10-21 | 15 | -60/+2589 |
| |\ \ \ \ |
|
| | | | | * | iommu/core: Remove global iommu_ops and register_iommu | Joerg Roedel | 2011-10-21 | 1 | -23/+4 |
| | | | | * | iommu/msm: Use bus_set_iommu instead of register_iommu | Joerg Roedel | 2011-10-21 | 1 | -1/+1 |
| | | | | * | iommu/omap: Use bus_set_iommu instead of register_iommu | Joerg Roedel | 2011-10-21 | 1 | -1/+1 |
| | | | | * | iommu/vt-d: Use bus_set_iommu instead of register_iommu | Joerg Roedel | 2011-10-21 | 1 | -1/+1 |
| | | | | * | iommu/amd: Use bus_set_iommu instead of register_iommu | Joerg Roedel | 2011-10-21 | 1 | -1/+1 |
| | | | | * | iommu/core: Use bus->iommu_ops in the iommu-api | Joerg Roedel | 2011-10-21 | 1 | -7/+27 |
| | | | | * | iommu/core: Convert iommu_found to iommu_present | Joerg Roedel | 2011-10-21 | 1 | -3/+6 |
| | | | | * | iommu/core: Add bus_type parameter to iommu_domain_alloc | Joerg Roedel | 2011-10-21 | 2 | -2/+14 |
| | | | | * | Driver core: Add iommu_ops to bus_type | Joerg Roedel | 2011-10-21 | 1 | -0/+31 |
| | | | | *---. | Merge branches 'debug/dma-api', 'arm/omap', 'arm/msm' and 'core' into api-2 | Joerg Roedel | 2011-09-06 | 160 | -897/+4150 |
| | | | | |\ \ \ |
|
| | | | | | | | * | iommu/core: Use PAGE_SIZE instead of hard-coded value | Joerg Roedel | 2011-09-06 | 1 | -2/+2 |
| | | | | | | | * | iommu/core: use the existing IS_ALIGNED macro | Ohad Ben-Cohen | 2011-09-05 | 1 | -6/+3 |
| | | | | | | * | | iommu/msm: ->unmap() should return order of unmapped page | Ohad Ben-Cohen | 2011-09-05 | 1 | -0/+7 |
| | | | * | | | | | iommu/core: let drivers know if an iommu fault handler isn't installed | Ohad Ben-Cohen | 2011-09-30 | 1 | -0/+6 |
| | | | * | | | | | iommu/core: export iommu_set_fault_handler() | Ohad Ben-Cohen | 2011-09-26 | 1 | -0/+1 |
| | | | * | | | | | iommu/omap: Migrate to the generic fault report mechanism | Ohad Ben-Cohen | 2011-09-14 | 1 | -28/+3 |
| | | | * | | | | | iommu/core: Add fault reporting mechanism | Ohad Ben-Cohen | 2011-09-14 | 1 | -0/+13 |
| | | | | |/ / /
| | | | |/| | | |
|
| | | * | | | | | iommu/omap: always provide iommu debug code | Arnd Bergmann | 2011-10-10 | 1 | -1/+1 |
| | | * | | | | | iommu/omap: Fix build error with !IOMMU_SUPPORT | Joerg Roedel | 2011-09-14 | 2 | -4/+3 |
| | | |/ / / / |
|
| | | * | | | | iommu/omap: ->unmap() should return order of unmapped page | Ohad Ben-Cohen | 2011-09-05 | 2 | -10/+5 |
| | | * | | | | iommu/omap: cleanup: remove a redundant statement | Ohad Ben-Cohen | 2011-09-05 | 1 | -4/+2 |
| | | * | | | | iommu/omap-iovmm: support non page-aligned buffers in iommu_vmap | Laurent Pinchart | 2011-09-05 | 1 | -10/+26 |
| | | * | | | | iommu: omap: add Kconfig OMAP dependency | Ohad Ben-Cohen | 2011-08-29 | 1 | -0/+1 |
| | | * | | | | omap: iommu: Fix up mutex->spin_lock conversion of iommu_lock | Joerg Roedel | 2011-08-26 | 1 | -3/+3 |
| | | * | | | | omap: iommu: omapify 'struct iommu' and exposed API | Ohad Ben-Cohen | 2011-08-26 | 8 | -139/+147 |
| | | * | | | | omap: iommu: remove unused exported API | Ohad Ben-Cohen | 2011-08-26 | 1 | -59/+0 |
| | | * | | | | omap: iovmm: remove unused functionality | Ohad Ben-Cohen | 2011-08-26 | 1 | -201/+0 |
| | | * | | | | omap: iommu: PREFETCH_IOTLB cleanup | Ohad Ben-Cohen | 2011-08-26 | 1 | -3/+16 |
| | | * | | | | omap: iommu: stop exporting local functions | Ohad Ben-Cohen | 2011-08-26 | 1 | -12/+7 |
| | | * | | | | omap: iommu/iovmm: move to dedicated iommu folder | Ohad Ben-Cohen | 2011-08-26 | 6 | -1/+2689 |
| | | * | | | | omap: iommu: migrate to the generic IOMMU API | Ohad Ben-Cohen | 2011-08-26 | 5 | -20/+50 |
| | | |/ / / |
|
| | * | | | | iommu/amd: Fix wrong shift direction | Joerg Roedel | 2011-10-11 | 1 | -1/+1 |
* | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp | Linus Torvalds | 2011-10-30 | 3 | -45/+44 |
|\ \ \ \ \ \ |
|
| * | | | | | | amd64_edac: Cleanup return type of amd64_determine_edac_cap() | Dan Carpenter | 2011-10-06 | 1 | -2/+2 |
| * | | | | | | amd64_edac: Add a fix for Erratum 505 | Borislav Petkov | 2011-10-06 | 1 | -5/+22 |
| * | | | | | | EDAC, MCE, AMD: Simplify NB MCE decoder interface | Borislav Petkov | 2011-10-06 | 3 | -17/+15 |
| * | | | | | | EDAC, MCE, AMD: Drop local coreid reporting | Borislav Petkov | 2011-10-06 | 1 | -19/+1 |
| * | | | | | | EDAC, MCE, AMD: Print valid addr when reporting an error | Borislav Petkov | 2011-10-06 | 1 | -1/+3 |
| * | | | | | | EDAC, MCE, AMD: Print CPU number when reporting the error | Borislav Petkov | 2011-10-06 | 1 | -2/+2 |
* | | | | | | | Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 | Linus Torvalds | 2011-10-30 | 128 | -7221/+11106 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | video: platinumfb: Add __devexit_p at necessary place | Axel Lin | 2011-10-15 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into ... | Florian Tobias Schandinat | 2011-10-15 | 43 | -4376/+5823 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | OMAPDSS: picodlp: add missing #include <linux/module.h> | Tomi Valkeinen | 2011-10-04 | 1 | -0/+1 |
| | * | | | | | | | OMAPDSS: DISPC: zorder support for DSS overlays | Archit Taneja | 2011-10-03 | 2 | -0/+96 |
| | * | | | | | | | OMAPDSS: DISPC: VIDEO3 pipeline support | Archit Taneja | 2011-10-03 | 5 | -6/+93 |
| | * | | | | | | | OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting | Archit Taneja | 2011-10-03 | 6 | -40/+58 |
| | * | | | | | | | video/omap: fix build dependencies | Arnd Bergmann | 2011-10-03 | 1 | -3/+6 |
| | * | | | | | | | OMAPDSS: remove vaddr from overlay info | Tomi Valkeinen | 2011-09-30 | 2 | -15/+5 |