diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2013-01-09 16:05:36 +0530 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-01-09 21:57:37 +0000 |
| commit | 6c6391f55805236ff8f8201ac42e0eb59f03f89f (patch) | |
| tree | 6f06dcbda4425c6e26ec8a5de3ee23e73bc242e4 /drivers/staging/Makefile | |
| parent | c9f923316ac7a8d1fc1fc0e7bb7937a828e5ec33 (diff) | |
Add deleted code during 3.8 linaro-android mergetracking-linaro-android-3.8-llct-20130115.0tracking-linaro-android-3.8-llct-20130114.0
Fix up mismerge.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: John Stultz <jstultz@nisse.canonical.com>
Diffstat (limited to 'drivers/staging/Makefile')
0 files changed, 0 insertions, 0 deletions