diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-01-20 17:31:52 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-01-20 17:31:52 +0400 |
| commit | 967809bd7faf71ddc29c8081e0f21db8b201a0f4 (patch) | |
| tree | 256bcce2b13a45b573b02ef73dcebe1f08a03593 /drivers/input/serio/i8042.c | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
| parent | 8d09a1bb3147ddbcf0a9483021ca699c54c54732 (diff) | |
| download | linux-967809bd7faf71ddc29c8081e0f21db8b201a0f4.tar.xz | |
Merge branch 'omap1-part2' into omap1
Conflicts:
drivers/leds/leds-ams-delta.c
Diffstat (limited to 'drivers/input/serio/i8042.c')
0 files changed, 0 insertions, 0 deletions