| commit | cbb24a25a871cbdac4e58b68b541aadd91b249be | [log] [tgz] |
|---|---|---|
| author | Joerg Roedel <jroedel@suse.de> | Wed Jul 23 16:04:37 2014 +0200 |
| committer | Joerg Roedel <jroedel@suse.de> | Wed Jul 23 16:04:37 2014 +0200 |
| tree | 0b8207913c437d91c938a64a48c1a1751a31a37b | |
| parent | aa4d066a2a8041b7e73cee68ce5499aca29f265e [diff] | |
| parent | e09f8ea560490e941139d23b4c278d3e6e2c871a [diff] |
Merge branch 'core' into x86/vt-d Conflicts: drivers/iommu/intel-iommu.c