| commit | b4d59fb412c00aa64a9219e8c177c252df93f68d | [log] [tgz] |
|---|---|---|
| author | Yinghai Lu <yinghai@kernel.org> | Tue Jun 26 17:04:59 2012 -0700 |
| committer | Yinghai Lu <yinghai@kernel.org> | Tue Jun 26 17:04:59 2012 -0700 |
| tree | 6dd5da29d25b05a18405f443a2ff2ea1cb9c6cad | |
| parent | b0b7208a4db49038b2e931237795a268b69bdee9 [diff] | |
| parent | ed546d47b0f8d02779e7bfd0a6c17dc58d4e0b33 [diff] |
Merge branch 'for-x86-irq' into for-iommu-base tip pci Conflicts: drivers/pci/quirks.c