diff options
| author | Xinyu Chen <b03824@freescale.com> | 2011-12-06 17:19:12 +0800 |
|---|---|---|
| committer | Xinyu Chen <b03824@freescale.com> | 2011-12-06 17:19:12 +0800 |
| commit | 4eb99c5e5be396410fa62178e94b8fca62abf7d5 (patch) | |
| tree | 17670f1e0ffb20a1aaa48a72a7312c1ee4a036cb /include/trace | |
| parent | 73c089abb36b98866bbfbaec0f9a2dafbfe73ed5 (diff) | |
| parent | b92265a274f0fec27567e86b995424ef8823499f (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_2.6.38' into imx_2.6.38_android
Conflicts:
arch/arm/mach-mx6/system.c
drivers/media/video/mxc/capture/mxc_v4l2_capture.c
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions