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/iwlwifi/iwl-agn-tx.c
	net/mac80211/sta_info.h

1 files changed, 31 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-bcma b/Documentation/ABI/testing/sysfs-bus-bcma
new file mode 100644
index 000000000000..06b62badddd1
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-bcma
@@ -0,0 +1,31 @@
+What:           /sys/bus/bcma/devices/.../manuf
+Date:           May 2011
+KernelVersion:  2.6.40
+Contact:        Rafał Miłecki <zajec5@gmail.com>
+Description:
+                Each BCMA core has it's manufacturer id. See
+                include/linux/bcma/bcma.h for possible values.
+
+What:           /sys/bus/bcma/devices/.../id
+Date:           May 2011
+KernelVersion:  2.6.40
+Contact:        Rafał Miłecki <zajec5@gmail.com>
+Description:
+                There are a few types of BCMA cores, they can be identified by
+                id field.
+
+What:           /sys/bus/bcma/devices/.../rev
+Date:           May 2011
+KernelVersion:  2.6.40
+Contact:        Rafał Miłecki <zajec5@gmail.com>
+Description:
+                BCMA cores of the same type can still slightly differ depending
+                on their revision. Use it for detailed programming.
+
+What:           /sys/bus/bcma/devices/.../class
+Date:           May 2011
+KernelVersion:  2.6.40
+Contact:        Rafał Miłecki <zajec5@gmail.com>
+Description:
+                Each BCMA core is identified by few fields, including class it
+                belongs to. See include/linux/bcma/bcma.h for possible values.