diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-10-10 20:39:40 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-10-10 20:39:40 -0700 |
| commit | 0927679c26e461abdce8704bfb5dea7646570109 (patch) | |
| tree | 8ac861e412ef125bbe0da52748b70ed7f0d3375d /drivers/rtc/rtc-max6902.c | |
| parent | 157097089f21d1c99b03b1d09fac82ccc4b1a636 (diff) | |
Commit uncommitted collision fix from last mergelinux-linaro-3.1-2011.10-0-android-0
Missed one silly collision line in the last merge.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/rtc/rtc-max6902.c')
0 files changed, 0 insertions, 0 deletions