linux-next: manual merge of the trivial tree with thejdelvare-hwmon tree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
MAINTAINERS between commit d8f00f1b531b25ac96a39385617ff1718bc8474b
("Move lis3lv02d drivers to drivers/misc") from the jdelvare-hwmon tree
and commit a23ce6da9677d245aa0aadc99f4197030350ab54 ("MAINTAINERS: fix
sorting") from the trivial tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc MAINTAINERS
index af304df,b6d6d51..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3887,6 -3881,12 +3888,12 @@@ L:	linux-security-module@xxxxxxxxxxxxxx
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
  S:	Supported
  
+ LIS3LV02D ACCELEROMETER DRIVER
+ M:	Eric Piel <eric.piel@xxxxxxxxxxxxxxxx>
+ S:	Maintained
 -F:	Documentation/hwmon/lis3lv02d
 -F:	drivers/hwmon/lis3lv02d.*
++F:	Documentation/misc-devices/lis3lv02d
++F:	drivers/misc/lis3lv02d/
+ 
  LLC (802.2)
  M:	Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxxxx>
  S:	Maintained
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/