Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (25 commits)
  virtio: balloon driver
  virtio: Use PCI revision field to indicate virtio PCI ABI version
  virtio: PCI device
  virtio_blk: implement naming for vda-vdz,vdaa-vdzz,vdaaa-vdzzz
  virtio_blk: Dont waste major numbers
  virtio_blk: provide getgeo
  virtio_net: parametrize the napi_weight for virtio receive queue.
  virtio: free transmit skbs when notified, not on next xmit.
  virtio: flush buffers on open
  virtnet: remove double ether_setup
  virtio: Allow virtio to be modular and used by modules
  virtio: Use the sg_phys convenience function.
  virtio: Put the virtio under the virtualization menu
  virtio: handle interrupts after callbacks turned off
  virtio: reset function
  virtio: populate network rings in the probe routine, not open
  virtio: Tweak virtio_net defines
  virtio: Net header needs hdr_len
  virtio: remove unused id field from struct virtio_blk_outhdr
  virtio: clarify NO_NOTIFY flag usage
  ...

diff --combined drivers/net/Kconfig
index 55d224c,e9d761c..f234ba3
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -814,8 -814,8 +814,8 @@@ config ULTRA3
          will be called smc-ultra32.
  
  config BFIN_MAC
 -      tristate "Blackfin 536/537 on-chip mac support"
 -      depends on NET_ETHERNET && (BF537 || BF536) && (!BF537_PORT_H)
 +      tristate "Blackfin 527/536/537 on-chip mac support"
 +      depends on NET_ETHERNET && (BF527 || BF537 || BF536) && (!BF537_PORT_H)
        select CRC32
        select MII
        select PHYLIB
@@@ -828,7 -828,7 +828,7 @@@
  
  config BFIN_MAC_USE_L1
        bool "Use L1 memory for rx/tx packets"
 -      depends on BFIN_MAC && BF537
 +      depends on BFIN_MAC && (BF527 || BF537)
        default y
        help
          To get maximum network performance, you should use L1 memory as rx/tx buffers.
@@@ -855,8 -855,7 +855,8 @@@ config BFIN_RX_DESC_NU
  config BFIN_MAC_RMII
        bool "RMII PHY Interface (EXPERIMENTAL)"
        depends on BFIN_MAC && EXPERIMENTAL
 -      default n
 +      default y if BFIN527_EZKIT
 +      default n if BFIN537_STAMP
        help
          Use Reduced PHY MII Interface
  
@@@ -1200,7 -1199,7 +1200,7 @@@ config NE2_MC
  
  config IBMLANA
        tristate "IBM LAN Adapter/A support"
 -      depends on MCA && MCA_LEGACY
 +      depends on MCA
        ---help---
          This is a Micro Channel Ethernet adapter.  You need to set
          CONFIG_MCA to use this driver.  It is both available as an in-kernel
@@@ -3114,6 -3113,7 +3114,7 @@@ config VIRTIO_NE
        tristate "Virtio network driver (EXPERIMENTAL)"
        depends on EXPERIMENTAL && VIRTIO
        ---help---
-         This is the virtual network driver for lguest.  Say Y or M.
+         This is the virtual network driver for virtio.  It can be used with
+           lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.
  
  endif # NETDEVICES