diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-10-11 19:38:39 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-11 19:38:39 +0200 |
| commit | 0361e02342f60b64a7075755d5851ed4e6f98c7d (patch) | |
| tree | 76ca78323ad1d4b1ecf1e8137f6b48eddcbebe3a /drivers/input/touchscreen | |
| parent | 4fdaa7b682b413dfb7ca9fa74ff45b1e0cb3dade (diff) | |
| parent | e9677b3ce207a07fad5746b6f7ddc70cae79de0a (diff) | |
Merge branch 'oprofile/perf' into oprofile/core
Conflicts:
arch/arm/oprofile/common.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'drivers/input/touchscreen')
0 files changed, 0 insertions, 0 deletions