diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-06 12:44:35 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-06 12:44:35 -0800 |
| commit | 6d0a5636fba5a3f82ec80ab124dd4748344549c3 (patch) | |
| tree | eb6d09f90c370696dd21f46baf6bdc6d36abb8c1 /net/dccp/ccids/ccid2.c | |
| parent | 038485ea9b66858c17f82e5393004532825106a7 (diff) | |
| parent | 7996bad8e62d8ca5888a935185ce313e693814b2 (diff) | |
Merge branch 'imx6/pm' into next/pm
* imx6/pm:
ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1
ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation
Diffstat (limited to 'net/dccp/ccids/ccid2.c')
0 files changed, 0 insertions, 0 deletions