Update libmtp from pre 1.1.4 git to 1.1.5 release.

util/mtp-hotplug.c

 /**
  * \file mtp-hotplug.c
  * Program to create hotplug scripts.
  *
  * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se>
  * Copyright (C) 2006-2008 Marcus Meissner <marcus@jet.franken.de>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ skipping 130 matching lines @@
              "GOTO=\"libmtp_rules_end\"\n\n"
              "LABEL=\"libmtp_usb_rules\"\n\n");
       printf("# Some sensitive devices we surely don\'t wanna probe\n");
       printf("# Color instruments\n");
       printf("ATTR{idVendor}==\"0670\", GOTO=\"libmtp_rules_end\"\n");
       printf("ATTR{idVendor}==\"0765\", GOTO=\"libmtp_rules_end\"\n");
       printf("ATTR{idVendor}==\"085c\", GOTO=\"libmtp_rules_end\"\n");
       printf("ATTR{idVendor}==\"0971\", GOTO=\"libmtp_rules_end\"\n");
       printf("# Canon scanners that look like MTP devices (PID 0x22nn)\n");
       printf("ATTR{idVendor}==\"04a9\", ATTR{idProduct}==\"22*\", GOTO=\"libmtp_rules_end\"\n");
+      printf("# Canon digital camera (EOS 3D) that looks like MTP device (PID 0x3113)\n");
+      printf("ATTR{idVendor}==\"04a9\", ATTR{idProduct}==\"3113\", GOTO=\"libmtp_rules_end\"\n");
       printf("# Sensitive Atheros devices that look like MTP devices\n");
       printf("ATTR{idVendor}==\"0cf3\", GOTO=\"libmtp_rules_end\"\n");
       printf("# Sensitive Atmel JTAG programmers\n");
       printf("ATTR{idVendor}==\"03eb\", GOTO=\"libmtp_rules_end\"\n");
       break;
     case style_udev_old:
       printf("# UDEV-style hotplug map for libmtp\n");
       printf("# Put this file in /etc/udev/rules.d\n\n");
       printf("ACTION!=\"add\", GOTO=\"libmtp_rules_end\"\n");
       printf("ENV{MAJOR}!=\"?*\", GOTO=\"libmtp_rules_end\"\n");
@@ skipping 103 matching lines @@
     printf("    </match>\n");
     printf("  </device>\n");
     printf("</deviceinfo>\n");
     break;
   case style_usbids:
     printf("\n");
   }
 
   exit (0);
 }