Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/wl12xx/wl1271_cmd.h

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/net/wireless/libertas/README b/drivers/net/wireless/libertas/README
index 2726c044430f..60fd1afe89ac 100644
--- a/drivers/net/wireless/libertas/README
+++ b/drivers/net/wireless/libertas/README
@@ -226,6 +226,18 @@ setuserscan
     All entries in the scan table (not just the new scan data when keep=1)
     will be displayed upon completion by use of the getscantable ioctl.
 
+hostsleep
+        This command is used to enable/disable host sleep.
+        Note: Host sleep parameters should be configured using
+        "ethtool -s ethX wol X" command before enabling host sleep.
+
+        Path: /sys/kernel/debug/libertas_wireless/ethX/
+
+        Usage:
+                cat hostsleep: reads the current hostsleep state
+                echo "1" > hostsleep : enable host sleep.
+                echo "0" > hostsleep : disable host sleep
+
 ========================
 IWCONFIG COMMANDS
 ========================