| commit | 123ed28d0811617e5a0a9f96e650720768ff80d6 | [log] [tgz] |
|---|---|---|
| author | Michael Ellerman <mpe@ellerman.id.au> | Fri Jun 05 18:27:08 2015 +1000 |
| committer | Michael Ellerman <mpe@ellerman.id.au> | Fri Jun 05 18:27:11 2015 +1000 |
| tree | c5d4b8ca156214b7b0e3d3460ff6764db6427fc4 | |
| parent | e36a281282a20be3e51adccc9c9d0be8262e3a7d [diff] | |
| parent | 7a6a010964a6fa86c5d41159ac1893cc918589fc [diff] |
Merge remote-tracking branch 'tip/auto-latest' Conflicts: drivers/clocksource/Makefile include/linux/intel-iommu.h include/linux/rcupdate.h