]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
projects / sojka / nv-tegra / linux-3.10.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c01d1d 15fd4c4)
Merge remote-tracking branch 'remotes/origin/dev/atmel-touch-v3.10' into remotes...
authorJubeom Kim <jubeomk@nvidia.com>
Fri, 14 Nov 2014 04:08:09 +0000 (13:08 +0900)
committerJubeom Kim <jubeomk@nvidia.com>
Fri, 14 Nov 2014 04:09:22 +0000 (13:09 +0900)
Merged files
1. drivers/input/touchscreen/atmel_mxt_ts.c
2. include/linux/i2c/atmel_mxt_ts.h
3. Documentation/devicetree/bindings/input/atmel,maxtouch.txt

Merge step
1. Git History Merge
2. Checkout 3 files from atmel-touch dev branch
3. Commit

Signed-off-by: Jubeom Kim <jubeomk@nvidia.com>

Trivial merge