diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-07-17 12:02:02 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-07-17 12:02:02 +0100 |
| commit | 20b22bdf99d678c928dc67fc9b24181e44975329 (patch) | |
| tree | 4b944cd666908e0464f4effe9e3b13b0b581ab7d /fs/f2fs | |
| parent | a7afdd36a825639ceeaaf4b430585afc1f4b4ade (diff) | |
| parent | b5fdc36b35130308bd62a18b4682b51708a7f378 (diff) | |
Merge branch 'tracking-armlt-psci' into lsk-3.10-vexpress
Conflicts:
arch/arm/kernel/psci.c
Diffstat (limited to 'fs/f2fs')
0 files changed, 0 insertions, 0 deletions