diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-07 08:53:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-07 08:53:30 +0200 |
| commit | 4a35ecf8bf1c4b039503fa554100fe85c761de76 (patch) | |
| tree | 9b75f5d5636004d9a9aa496924377379be09aa1f /Documentation/ABI | |
| parent | NET: usb: Adding URB_ZERO_PACKET flag to usbnet.c (diff) | |
| parent | smc91c92_cs: fix the problem of "Unable to find hardware address" (diff) | |
| download | linux-4a35ecf8bf1c4b039503fa554100fe85c761de76.tar.xz linux-4a35ecf8bf1c4b039503fa554100fe85c761de76.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'Documentation/ABI')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-usb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb index a986e9bbba3d..bcebb9eaedce 100644 --- a/Documentation/ABI/testing/sysfs-bus-usb +++ b/Documentation/ABI/testing/sysfs-bus-usb @@ -160,7 +160,7 @@ Description: match the driver to the device. For example: # echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id -What: /sys/bus/usb/device/.../avoid_reset +What: /sys/bus/usb/device/.../avoid_reset_quirk Date: December 2009 Contact: Oliver Neukum <oliver@neukum.org> Description: |