Re: [PATCH v2 4/6] ARM: SAMSUNG: Fix rebase error in pm-debug.c

2014-03-20 Thread Kukjin Kim
On 03/19/14 02:16, Tomasz Figa wrote: Recent Samsung header clean-up series did heavy reorganization of various Samsung-specific headers, unfortunately causing a conflict with Samsung PM consolidation series part 2 - multiplatform) and resulting with a merge error that caused a build failure,

[PATCH v2 4/6] ARM: SAMSUNG: Fix rebase error in pm-debug.c

2014-03-18 Thread Tomasz Figa
Recent Samsung header clean-up series did heavy reorganization of various Samsung-specific headers, unfortunately causing a conflict with Samsung PM consolidation series part 2 - multiplatform) and resulting with a merge error that caused a build failure, due to a missing header being included.