| commit | 05655946ee38809bbdc5644321abc4ae82579fa6 | [log] [tgz] |
|---|---|---|
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | Wed Jun 13 01:02:45 2012 +0400 |
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | Wed Jun 13 01:02:45 2012 +0400 |
| tree | c9a8c3c3c1b81833880a6b919e4980307e45a6d1 | |
| parent | 1f3bb2595c5473383ef09f4db9ecb60864fd85bd [diff] | |
| parent | e2c8996352c54db5a1f7f7316672c659948a2745 [diff] |
Automatically merging tracking-samsung-tracking into merge-linux-linaro-tracking Conflicting files: drivers/input/touchscreen/Kconfig drivers/input/touchscreen/Makefile drivers/staging/Kconfig drivers/staging/Makefile