diff --git a/[refs] b/[refs] index a3868568af9e..18486dcfef68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95c754545353ca7db2e12485546eac626f8461f9 +refs/heads/master: 6ffe1ffb074d2152db5fbecab815915f657306bb diff --git a/trunk/Documentation/ABI/removed/raw1394 b/trunk/Documentation/ABI/removed/raw1394 index 490aa1efc4ae..ec333e676322 100644 --- a/trunk/Documentation/ABI/removed/raw1394 +++ b/trunk/Documentation/ABI/removed/raw1394 @@ -5,7 +5,7 @@ Description: /dev/raw1394 was a character device file that allowed low-level access to FireWire buses. Its major drawbacks were its inability to implement sensible device security policies, and its low level - of abstraction that required userspace clients do duplicate much + of abstraction that required userspace clients to duplicate much of the kernel's ieee1394 core functionality. Replaced by /dev/fw*, i.e. the ABI of firewire-core.