From: Dmitry Torokhov Date: Sat, 24 Nov 2012 08:02:54 +0000 (-0800) Subject: Merge branch 'for-linus' into next X-Git-Tag: v3.8-rc1~58^2^2~30 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1;p=users%2Fjedix%2Flinux-maple.git Merge branch 'for-linus' into next Bring in changes to ads7846 to avoid mereg conflicts. --- 5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1