From: Nick Dyer Date: Thu, 11 Sep 2014 17:31:45 +0000 (-0700) Subject: Input: atmel_mxt_ts - fix merge in DT documentation X-Git-Tag: fixes-for-v3.18-merge-window~117^2 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=807362cd960daac415e2c8906750b2472c22c80e;p=pandora-kernel.git Input: atmel_mxt_ts - fix merge in DT documentation Something went a bit wrong in merging f5940231a - there's a bit of repeated text that's been introduced. Signed-off-by: Nick Dyer Signed-off-by: Dmitry Torokhov --- Reading git-diff-tree failed