diff options
| author | 2012-07-07 16:18:33 -0700 | |
|---|---|---|
| committer | 2012-07-07 16:18:33 -0700 | |
| commit | f053ea8d841a3a4620fff4a1b2ab1da9d7c53939 (patch) | |
| tree | f8b6e0fc8c5c07d40db8d3aa3645092ab3d57ec6 /include/linux/debugobjects.h | |
| parent | Merge branch 'for-linus' to bring in change ensuring that drivers that (diff) | |
| parent | Revert "Input: atmel_mxt_ts - warn if sysfs could not be created" (diff) | |
Pull input changes from Henrik Rydberg, including large update to
atmel_mxt_ts driver by Daniel and MT protocol addition for win8 devices.
Conflicts:
drivers/input/touchscreen/atmel_mxt_ts.c
Diffstat (limited to 'include/linux/debugobjects.h')
0 files changed, 0 insertions, 0 deletions
