-
Committer:
Package Import Robot
-
Author(s):
Adam Conrad
-
Date:
2014-04-21 22:35:26 UTC
-
mfrom:
(1.1.6)
(19.1.1 utopic-proposed)
-
Revision ID:
package-import@ubuntu.com-20140421223526-yx8rvwauilz4kozl
Tags: 16-2ubuntu1
* Merge with Debian unstable, remaining changes:
- Install ubuntu-specific depmod.d and modprobe.d contents.
- Install /etc/modprobe.d/mlx4.conf in libkmod2-udeb for d-i.
- Install upstart job and exit the init script under upstart.
- Update libtool macros and rerun autoconf for new arches.
- Mark module-init-tools as Multi-Arch: foreign.