Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	sound/core/memalloc.c

diff --cc Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
Simple merge

diff --cc arch/sparc/kernel/sun4d_smp.c
Simple merge

diff --cc arch/sparc/kernel/sun4m_smp.c
Simple merge

diff --cc arch/sparc64/kernel/irq.c
Simple merge

diff --cc arch/sparc64/kernel/of_device.c
Simple merge

diff --cc arch/sparc64/kernel/pci.c
Simple merge

diff --cc arch/sparc64/kernel/traps.c
Simple merge

diff --cc drivers/ata/Kconfig
Simple merge

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/hwmon/Makefile
Simple merge

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/leds/Makefile
Simple merge

diff --cc drivers/net/myri_sbus.c
index 979d778b133b8242dba21a3a70468ee066b6d2d6,06e682334c7e19ace535c67eb811fa5a020ced47..3ad7589d6a1c36b341920e6a2c4548d34de3ff92
--- 1/drivers/net/myri_sbus.c
--- 2/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@@ -1101,12 -1105,20 +1101,12 @@@ err
        return -ENODEV;
  }
  
 -
 -static int __devinit myri_sbus_probe(struct of_device *dev, const struct of_device_id *match)
 -{
 -      struct sbus_dev *sdev = to_sbus_device(&dev->dev);
 -
 -      return myri_ether_init(sdev);
 -}
 -
 -static int __devexit myri_sbus_remove(struct of_device *dev)
 +static int __devexit myri_sbus_remove(struct of_device *op)
  {
 -      struct myri_eth *mp = dev_get_drvdata(&dev->dev);
 +      struct myri_eth *mp = dev_get_drvdata(&op->dev);
        struct net_device *net_dev = mp->dev;
  
-       unregister_netdevice(net_dev);
+       unregister_netdev(net_dev);
  
        free_irq(net_dev->irq, net_dev);
  

diff --cc drivers/net/sunbmac.c
index 3f342b35a77f6a48033ad49b77b39372bfc94ba3,31e7384e312ad71a437144acb030730e34771d8e..018d0fca9422bc2760c835b6f9a9de46670da7e1
--- 1/drivers/net/sunbmac.c
--- 2/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@@ -1240,39 -1255,35 +1240,39 @@@ fail_and_cleanup
        return -ENODEV;
  }
  
 -/* QEC can be the parent of either QuadEthernet or
 - * a BigMAC.  We want the latter.
 +/* QEC can be the parent of either QuadEthernet or a BigMAC.  We want
 + * the latter.
   */
 -static int __devinit bigmac_sbus_probe(struct of_device *dev, const struct of_device_id *match)
 +static int __devinit bigmac_sbus_probe(struct of_device *op,
 +                                     const struct of_device_id *match)
  {
 -      struct sbus_dev *sdev = to_sbus_device(&dev->dev);
 -      struct device_node *dp = dev->node;
 +      struct device *parent = op->dev.parent;
 +      struct of_device *qec_op;
  
 -      if (!strcmp(dp->name, "be"))
 -              sdev = sdev->parent;
 +      qec_op = to_of_device(parent);
  
 -      return bigmac_ether_init(sdev);
 +      return bigmac_ether_init(op, qec_op);
  }
  
 -static int __devexit bigmac_sbus_remove(struct of_device *dev)
 +static int __devexit bigmac_sbus_remove(struct of_device *op)
  {
 -      struct bigmac *bp = dev_get_drvdata(&dev->dev);
 +      struct bigmac *bp = dev_get_drvdata(&op->dev);
 +      struct device *parent = op->dev.parent;
        struct net_device *net_dev = bp->dev;
 +      struct of_device *qec_op;
 +
 +      qec_op = to_of_device(parent);
  
-       unregister_netdevice(net_dev);
+       unregister_netdev(net_dev);
  
 -      sbus_iounmap(bp->gregs, GLOB_REG_SIZE);
 -      sbus_iounmap(bp->creg, CREG_REG_SIZE);
 -      sbus_iounmap(bp->bregs, BMAC_REG_SIZE);
 -      sbus_iounmap(bp->tregs, TCVR_REG_SIZE);
 -      sbus_free_consistent(bp->bigmac_sdev,
 -                           PAGE_SIZE,
 -                           bp->bmac_block,
 -                           bp->bblock_dvma);
 +      of_iounmap(&qec_op->resource[0], bp->gregs, GLOB_REG_SIZE);
 +      of_iounmap(&op->resource[0], bp->creg, CREG_REG_SIZE);
 +      of_iounmap(&op->resource[1], bp->bregs, BMAC_REG_SIZE);
 +      of_iounmap(&op->resource[2], bp->tregs, TCVR_REG_SIZE);
 +      dma_free_coherent(&op->dev,
 +                        PAGE_SIZE,
 +                        bp->bmac_block,
 +                        bp->bblock_dvma);
  
        free_netdev(net_dev);
  

diff --cc drivers/scsi/qlogicpti.c
Simple merge

diff --cc include/sound/core.h
Simple merge

diff --cc include/sound/memalloc.h
Simple merge

diff --cc sound/core/memalloc.c
Simple merge

diff --cc sound/sparc/amd7930.c
Simple merge

diff --cc sound/sparc/cs4231.c
Simple merge

diff --cc sound/sparc/dbri.c
Simple merge