Merge branch 'master' of git+ssh://master.kernel.org/pub/scm/linux/hotplug/udev

diff --git a/extras/keymap/README.keymap.txt b/extras/keymap/README.keymap.txt
index 1558db87826a88befae30dd9b9e455fb5e1d9145..eab8587de8abd5747ebb268ef7977f0518bfe9d8 100644 (file)
--- a/extras/keymap/README.keymap.txt
+++ b/extras/keymap/README.keymap.txt
@@ -44,7 +44,7 @@ for inclusion you need to do the following steps:
 
  1. Find the keyboard device.
 
- Run /usr/share/udev/findkeyboards. This should always give you an "AT
+ Run /lib/udev/findkeyboards. This should always give you an "AT
  keyboard" and possibly a "module". Some laptops (notably Thinkpads, Sonys, and
  Acers) have multimedia/function keys on a separate input device instead of the
  primary keyboard. The keyboard device should have a name like "input/event3".

diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules
index fc270395970e3f977cffd74fbc29b0c6c3a6a5a4..26b805565abb9e11ca9d35d08e3eda0fa378b5c3 100644 (file)
--- a/extras/udev-acl/70-acl.rules
+++ b/extras/udev-acl/70-acl.rules
@@ -17,6 +17,9 @@ KERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="HP|EPSON|Epson", ENV{ACL_M
 # USB scanners
 ENV{libsane_matched}=="yes", ENV{ACL_MANAGE}="1"
 
+# HPLIP devices (necessary for ink level check and HP tool maintenance)
+ENV{ID_HPLIP}=="1", ENV{ACL_MANAGE}="1"
+
 # optical drives
 SUBSYSTEM=="block", ENV{ID_CDROM}=="1", ENV{ACL_MANAGE}="1"