diff options
| author | Joerg Roedel <jroedel@suse.de> | 2014-07-23 16:04:37 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-07-23 16:04:37 +0200 |
| commit | cbb24a25a871cbdac4e58b68b541aadd91b249be (patch) | |
| tree | 0b8207913c437d91c938a64a48c1a1751a31a37b /drivers/block/cciss_scsi.h | |
| parent | aa4d066a2a8041b7e73cee68ce5499aca29f265e (diff) | |
| parent | e09f8ea560490e941139d23b4c278d3e6e2c871a (diff) | |
Merge branch 'core' into x86/vt-d
Conflicts:
drivers/iommu/intel-iommu.c
Diffstat (limited to 'drivers/block/cciss_scsi.h')
0 files changed, 0 insertions, 0 deletions