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: (1674 commits)
  qlcnic: adding co maintainer
  ixgbe: add support for active DA cables
  ixgbe: dcb, do not tag tc_prio_control frames
  ixgbe: fix ixgbe_tx_is_paused logic
  ixgbe: always enable vlan strip/insert when DCB is enabled
  ixgbe: remove some redundant code in setting FCoE FIP filter
  ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
  ixgbe: fix header len when unsplit packet overflows to data buffer
  ipv6: Never schedule DAD timer on dead address
  ipv6: Use POSTDAD state
  ipv6: Use state_lock to protect ifa state
  ipv6: Replace inet6_ifaddr->dead with state
  cxgb4: notify upper drivers if the device is already up when they load
  cxgb4: keep interrupts available when the ports are brought down
  cxgb4: fix initial addition of MAC address
  cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
  cnic: Convert cnic_local_flags to atomic ops.
  can: Fix SJA1000 command register writes on SMP systems
  bridge: fix build for CONFIG_SYSFS disabled
  ARCNET: Limit com20020 PCI ID matches for SOHARD cards
  ...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c

2 files changed, 5 insertions, 8 deletions

diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c
index 771137fc1a82..5ccb0ceff6c4 100644
--- a/arch/arm/mach-pxa/icontrol.c
+++ b/arch/arm/mach-pxa/icontrol.c
@@ -73,7 +73,6 @@ static struct pxa2xx_spi_chip mcp251x_chip_info4 = {
 
 static struct mcp251x_platform_data mcp251x_info = {
         .oscillator_frequency = 16E6,
-        .model                = CAN_MCP251X_MCP2515,
         .board_specific_setup = NULL,
         .power_enable         = NULL,
         .transceiver_enable   = NULL
@@ -81,7 +80,7 @@ static struct mcp251x_platform_data mcp251x_info = {
 
 static struct spi_board_info mcp251x_board_info[] = {
         {
-                .modalias        = "mcp251x",
+                .modalias        = "mcp2515",
                 .max_speed_hz    = 6500000,
                 .bus_num         = 3,
                 .chip_select     = 0,
@@ -90,7 +89,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                 .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ1)
         },
         {
-                .modalias        = "mcp251x",
+                .modalias        = "mcp2515",
                 .max_speed_hz    = 6500000,
                 .bus_num         = 3,
                 .chip_select     = 1,
@@ -99,7 +98,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                 .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ2)
         },
         {
-                .modalias        = "mcp251x",
+                .modalias        = "mcp2515",
                 .max_speed_hz    = 6500000,
                 .bus_num         = 4,
                 .chip_select     = 0,
@@ -108,7 +107,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                 .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ3)
         },
         {
-                .modalias        = "mcp251x",
+                .modalias        = "mcp2515",
                 .max_speed_hz    = 6500000,
                 .bus_num         = 4,
                 .chip_select     = 1,
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c
index 3680f6a90623..03b9cb910e08 100644
--- a/arch/arm/mach-pxa/zeus.c
+++ b/arch/arm/mach-pxa/zeus.c
@@ -414,15 +414,13 @@ static int zeus_mcp2515_transceiver_enable(int enable)
 
 static struct mcp251x_platform_data zeus_mcp2515_pdata = {
         .oscillator_frequency   = 16*1000*1000,
-        .model                  = CAN_MCP251X_MCP2515,
         .board_specific_setup   = zeus_mcp2515_setup,
-        .transceiver_enable     = zeus_mcp2515_transceiver_enable,
         .power_enable           = zeus_mcp2515_transceiver_enable,
 };
 
 static struct spi_board_info zeus_spi_board_info[] = {
         [0] = {
-                .modalias       = "mcp251x",
+                .modalias       = "mcp2515",
                 .platform_data  = &zeus_mcp2515_pdata,
                 .irq            = gpio_to_irq(ZEUS_CAN_GPIO),
                 .max_speed_hz   = 1*1000*1000,