diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-15 10:18:15 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-15 10:18:15 (GMT) |
| commit | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 (patch) | |
| tree | fdec753b842dad09e3a4151954fab3eb5c43500d /drivers/of/of_i2c.c | |
| parent | d6a65dffb30d8636b1e5d4c201564ef401a246cf (diff) | |
| parent | 18240904960a39e582ced8ba8ececb10b8c22dd3 (diff) | |
| download | linux-fsl-qoriq-dca2d6ac09d9ef59ff46820d4f0c94b08a671202.tar.xz | |
Merge branch 'linus' into tracing/hw-breakpoints
Conflicts:
arch/x86/kernel/process_64.c
Semantic conflict fixed in:
arch/x86/kvm/x86.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/of/of_i2c.c')
0 files changed, 0 insertions, 0 deletions