summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-09-05 12:20:24 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-09-05 12:20:24 -0700
commit92944c1c943647c7eb39c081feeecdd169f68ee4 (patch)
tree1412deee46f6be19cf9b5a65a8d76ed4553866a8 /README
parent77686517977e77d101c8a7b397717df00a88922b (diff)
parentd4f5f937c3dfdea9f49c3cdeea8813b0d9f7715a (diff)
downloadop-kernel-dev-92944c1c943647c7eb39c081feeecdd169f68ee4.zip
op-kernel-dev-92944c1c943647c7eb39c081feeecdd169f68ee4.tar.gz
Merge branch 'mrst-touchscreen' into next
Conflicts: drivers/input/touchscreen/Makefile
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud