diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-01-05 14:18:50 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-01-05 14:18:50 +0000 |
| commit | cc126c89d9c292016817cad576347500adceba6e (patch) | |
| tree | 67730b19ba16f840ff22341db4e87e1568d71285 /kernel/trace/trace_sched_switch.c | |
| parent | 80caa250766ea8b145cd692e82ec4d6296adef8c (diff) | |
| parent | a7004d76d61fa923de40390c49c8d69002fd762f (diff) | |
Automatically merging tracking-igloo_kernel-usb into merge-integration-linux-ux500
Conflicting files:
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/board-u5500.c
Diffstat (limited to 'kernel/trace/trace_sched_switch.c')
0 files changed, 0 insertions, 0 deletions