diff options
| author | Justin Waters <justin.waters@timesys.com> | 2012-08-02 12:11:13 -0400 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2012-08-02 12:11:13 -0400 |
| commit | 101eca5af60e95bae2ba642ef93681bb184107bc (patch) | |
| tree | 5bf8ba4075671d5e3d45dcc40d971ad057e77c48 /include/linux/spi/tsc2005.h | |
| parent | a7e93790bb050e8d4bc1982550e8fc44a0747b49 (diff) | |
| parent | 2bcc4aedaf8fb4e022ae9f80bf36926367b8c5f6 (diff) | |
Merge remote-tracking branch 'github/3.0-vybrid-lineo' into 3.0-vybrid
Conflicts:
arch/arm/mach-mvf/board-twr_vf600.c
Diffstat (limited to 'include/linux/spi/tsc2005.h')
0 files changed, 0 insertions, 0 deletions