From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Apr 2009 01:05:43 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=bfe8ff32ae3c2ae47c26883d7703b64172e62487;p=linux-firmware

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  b44: Use kernel DMA addresses for the kernel DMA API
  forcedeth: Fix resume from hibernation regression.
  xfrm: fix fragmentation on inter family tunnels
  ibm_newemac: Fix dangerous struct assumption
  gigaset: documentation update
  gigaset: in file ops, check for device disconnect before anything else
  bas_gigaset: use tasklet_hi_schedule for timing critical tasklets
  net/802/fddi.c: add MODULE_LICENSE
  smsc911x: remove unused #include <linux/version.h>
  axnet_cs: fix phy_id detection for bogus Asix chip.
  bnx2: Use request_firmware()
  b44: Fix sizes passed to b44_sync_dma_desc_for_{device,cpu}()
  socket: use percpu_add() while updating sockets_in_use
  virtio_net: Set the mac config only when VIRITO_NET_F_MAC
  myri_sbus: use request_firmware
  e1000: fix loss of multicast packets
  vxge: should include tcp.h

Conflict in firmware/WHENCE (SCSI vs net firmware)
---

bfe8ff32ae3c2ae47c26883d7703b64172e62487
diff --cc WHENCE
index c006af8,f3d0151..e4deb51
--- a/WHENCE
+++ b/WHENCE
@@@ -623,12 -544,32 +623,42 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
 +Driver: SCSI_QLOGICPTI - PTI Qlogic, ISP Driver
 +
 +File: qlogic/isp1000.bin
 +
 +Licence: Unknown
 +
 +Found in hex form in kernel source.
 +
 +--------------------------------------------------------------------------
++
+ Driver: MYRI_SBUS - MyriCOM Gigabit Ethernet
+ 
+ File: myricom/lanai.bin
+ 
+ Licence: Unknown
+ 
+ Found in hex form in kernel source.
+ 
+ --------------------------------------------------------------------------
+ 
+ Driver: BNX2 - Broadcom NetXtremeII
+ 
+ File: bnx2/bnx2-mips-06-4.6.16.fw
+ File: bnx2/bnx2-rv2p-06-4.6.16.fw
+ File: bnx2/bnx2-mips-09-4.6.17.fw
+ File: bnx2/bnx2-rv2p-09-4.6.15.fw
+ 
+ Licence:
+ 
+  This file contains firmware data derived from proprietary unpublished
+  source code, Copyright (c) 2004 - 2009 Broadcom Corporation.
+ 
+  Permission is hereby granted for the distribution of this firmware data
+  in hexadecimal or equivalent format, provided this copyright notice is
+  accompanying it.
+ 
+ Found in hex form in kernel source.
+ 
+ --------------------------------------------------------------------------