Compare: c240a539df4e2d50f86e vs 9affd6becbfb2c3f0d04
| Description: | Merge tag 'trace-fixes-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace | arm: fix mismerge of arch/arm/mach-omap2/timer.c |
|---|---|---|
| Date: | May 16, 2013, 12:01 p.m. | May 8, 2013, 11:59 a.m. |
| Hash: | c240a539df4e2d50f86e2f31813ff6b7334cd493 | 9affd6becbfb2c3f0d04e554bb87234761b37aba |
| Branches: | linus | linus |
| Gitweb: | git.kernel.org | git.kernel.org |
| Progress: | 61% 120/194 | 15% 30/194 |
| Successful: | 84% 101/120 | 83% 25/30 |
| Previous: | b973425cbb51e08301b3 (compare) | 9607a85b67a9714290a7 (compare) |
| Next: | 4a007ed926fd4cbb4afe (compare) | 5af43c24ca59a448c931 (compare) |