~ubuntu-branches/ubuntu/utopic/kmod/utopic

Viewing all changes in revision 24.

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2014-06-23 22:47:02 UTC
  • mfrom: (1.1.7) (22.1.2 utopic-proposed)
  • Revision ID: package-import@ubuntu.com-20140623224702-50q09rfui5vi63ju
Tags: 18-1ubuntu1
* 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.
  - Mark transitional module-init-tools as Multi-Arch: foreign.
  - Test-guard /lib/modprobe.d/* copying in our initramfs hook.
  - Drop the alsa-base Breaks, our version is quite different.
  - On upgrade, remove obsolete rtc module from /etc/modules.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: