diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-04 11:04:15 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-04 11:04:15 +0100 |
| commit | 62a258ae768ae8ab4912711cf3316e43b18c7374 (patch) | |
| tree | b284199f0a5a9b5ca1178a9a0189bfba6e765dc5 /drivers/input/touchscreen/s3c2410_ts.c | |
| parent | 21f85315656630a662927b9754549b30d7198777 (diff) | |
| parent | bbfeb9cbfdf307a6d707243ffbb9a9849358ae9f (diff) | |
Merge branch 'pcf50606-2.6.31' into om-gta01-2.6.31
Conflicts:
drivers/power/pcf50606-charger.c
Diffstat (limited to 'drivers/input/touchscreen/s3c2410_ts.c')
0 files changed, 0 insertions, 0 deletions