Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.

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.