diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 02:15:12 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 02:15:12 (GMT) |
| commit | 339a4b72c83dc7d8b29f43f7417add791e201ad3 (patch) | |
| tree | 7e1cf20b82fbe42ed96b246a86e0cccadb3912de /drivers/char/ps3flash.c | |
| parent | dba538ff5610ee126e33a28fe713b3f108d31f2c (diff) | |
| parent | ced3c42c9fcba049ec9c76c8461ac194cafb20ba (diff) | |
| download | linux-fsl-qoriq-339a4b72c83dc7d8b29f43f7417add791e201ad3.tar.xz | |
Merge branch 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 iommu changes from Ingo Molnar:
"Make it easier to turn off the old AMD GART code"
* 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/iommu: Clean up the CONFIG_GART_IOMMU config option a bit
x86/iommu: Don't make AMD_GART depend on EXPERT and default y
Diffstat (limited to 'drivers/char/ps3flash.c')
0 files changed, 0 insertions, 0 deletions