diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-08 22:51:43 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-14 22:54:38 +0200 |
| commit | 34c453ce16633539a94a2e876faeb731ac1be899 (patch) | |
| tree | cbd8013079b316cc796044f7cb28d9b5a907ade5 /kernel/nsproxy.c | |
| parent | ARM: S3C24XX: remove SAMSUNG_CLOCK remnants after ccf conversion (diff) | |
| download | linux-34c453ce16633539a94a2e876faeb731ac1be899.tar.xz linux-34c453ce16633539a94a2e876faeb731ac1be899.zip | |
ARM: S3C24XX: fix merge conflict
Missed some changes during re-sorting this branch.
So fixed it.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'kernel/nsproxy.c')
0 files changed, 0 insertions, 0 deletions