Eugeni Dodonov
8bc1f85c02
iommu: Export intel_iommu_enabled to signal when iommu is in use ...
In i915 driver, we do not enable either rc6 or semaphores on SNB when dmar
is enabled. The new 'intel_iommu_enabled' variable signals when the
iommu code is in operation.
Cc: Ted Phelps <phelps@gnusto.com>
Cc: Peter <pab1612@gmail.com>
Cc: Lukas Hejtmanek <xhejtman@fi.muni.cz>
Cc: Andrew Lutomirski <luto@mit.edu>
CC: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-12-16 08:49:57 -08:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2011-11-07 10:13:52 -08:00
Merge Qualcom Hexagon architecture
2011-11-01 07:48:13 -07:00
crypto: Add a report function pointer to crypto_type
2011-10-21 14:24:03 +02:00
drm: integer overflow in drm_mode_dirtyfb_ioctl()
2011-11-23 08:59:28 +00:00
iommu: Export intel_iommu_enabled to signal when iommu is in use
2011-12-16 08:49:57 -08:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
[media] altera-stapl: it is time to move out from staging
2011-09-23 15:00:57 -03:00
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2011-11-09 16:22:15 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2011-11-01 10:51:38 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2011-10-28 16:44:18 -07:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2011-11-06 19:00:42 -08:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next
2011-10-15 00:19:52 +00:00
xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI
2011-11-16 12:13:42 -05:00
8bc1f85c02