Merge branches 'topic/fix/asoc', 'topic/fix/hda', 'topic/fix/misc' and 'topic/pci...

diff --combined sound/pci/cs5530.c
index 7ff8b68e997e89cbb83bda6ced49f49cf44ceea9,7ff8b68e997e89cbb83bda6ced49f49cf44ceea9,7ff8b68e997e89cbb83bda6ced49f49cf44ceea9,4ba2db2f4250d6b3b32b8c1254acca1282223c8f,4d9378d812000fbea40a422515d8e7b9e5a7c80e..6dea5b5cc77419814334addf8b22c06c5bee142c
--- 1/sound/pci/cs5530.c
--- 2/sound/pci/cs5530.c
--- 3/sound/pci/cs5530.c
--- 4/sound/pci/cs5530.c
--- 5/sound/pci/cs5530.c
+++ b/sound/pci/cs5530.c
@@@@@@ -2,7 -2,7 -2,7 -2,7 -2,7 +2,7 @@@@@@
      * cs5530.c - Initialisation code for Cyrix/NatSemi VSA1 softaudio
      *
      *         (C) Copyright 2007 Ash Willis <ashwillis@programmer.net>
--- - * (C) Copyright 2003 Red Hat Inc <alan@redhat.com>
+++ + * (C) Copyright 2003 Red Hat Inc <alan@lxorguk.ukuu.org.uk>
      *
      * This driver was ported (shamelessly ripped ;) from oss/kahlua.c but I did
      * mess with it a bit. The chip seems to have to have trouble with full duplex
@@@@@@ -132,7 -132,7 -132,7 -132,7 -132,7 +132,7 @@@@@@ static int __devinit snd_cs5530_create(
        }
        chip->pci_base = pci_resource_start(pci, 0);
     
----    mem = ioremap_nocache(chip->pci_base, pci_resource_len(pci, 0));
++++    mem = pci_ioremap_bar(pci, 0);
        if (mem == NULL) {
                kfree(chip);
                pci_disable_device(pci);

diff --combined sound/sound_core.c
index faef87a9bc3fdbac4f5ed27040877de887db6783,4ae07e236b36a81d87a51307a9272b50cef17528,4ae07e236b36a81d87a51307a9272b50cef17528,ee66d43f848c549c7f93a62dbe46325430456128,faef87a9bc3fdbac4f5ed27040877de887db6783..a75b289a5d78465c25ccf2aab83958e3e8a0a67d
--- 1/sound/sound_core.c
--- 2/sound/sound_core.c
--- 3/sound/sound_core.c
--- 4/sound/sound_core.c
--- 5/sound/sound_core.c
+++ b/sound/sound_core.c
@@@@@@ -57,7 -57,7 -57,7 -57,7 -57,7 +57,7 @@@@@@ module_exit(cleanup_soundcore)
     /*
      * OSS sound core handling. Breaks out sound functions to submodules
      * 
--- - * Author:         Alan Cox <alan.cox@linux.org>
+++ + * Author:         Alan Cox <alan@lxorguk.ukuu.org.uk>
      *
      * Fixes:
      *
@@@@@@ -220,8 -220,9 -220,9 -220,9 -220,8 +220,8 @@@@@@ static int sound_insert_unit(struct sou
        else
                sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP);
     
 ---    device_create_drvdata(sound_class, dev,
 ---                          MKDEV(SOUND_MAJOR, s->unit_minor),
 ---                          NULL, s->name+6);
 +++    device_create(sound_class, dev, MKDEV(SOUND_MAJOR, s->unit_minor),
 +++                  NULL, s->name+6);
        return r;
     
      fail: