Olof Johansson 0f9cb211ba Linux 3.7-rc7 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQss0FAAoJEHm+PkMAQRiG6cEH/An3PYsWBBy27tzoLyVfJKF1 3m3vR8HS2tnHg6erxms+738jos59vrWXV0Ygnvw0DHbGR0HNb4rkwce/KXu/jgOD MRYNYhlhMFJTEUFrSrcwKITrAV3kVPWXxPXgAR6Gzpr6NPKKM9TBzEv0ze56TFYz asOxqeBcPSS7aFZlkoNsy1wG4l0Quo5ke8VZIxo9Me5qlqubAoZ6pING4wAGXqeE tf81CevSdpe0nqr8/dlYyCvLjrurgpJQczxRCBI3mP6kLWGfUCVzZmcu86PfT9b+ 35zNJwDneIoN+D9bVDHy6mrq9uQdmhWnQuhv1joTPn6RDn1nyBRBd+A5qLxSov4= =CPoy -----END PGP SIGNATURE----- Merge tag 'v3.7-rc7' into next/cleanup Merging in mainline back to next/cleanup since it has collected a few conflicts between fixes going upstream and some of the cleanup patches. Git doesn't auto-resolve some of them, and they're mostly noise so let's take care of it locally. Conflicts are in: arch/arm/mach-omap2/omap_hwmod_44xx_data.c arch/arm/plat-omap/i2c.c drivers/video/omap2/dss/dss.c Signed-off-by: Olof Johansson <olof@lixom.net>		2012-11-25 21:34:34 -08:00
..
aoa	sound/aoa: Adapt to new i2c probing scheme	2012-07-11 18:22:48 +10:00
arm	ALSA: platform: Check CONFIG_PM_SLEEP instead of CONFIG_PM	2012-08-09 15:47:15 +02:00
atmel	ALSA: sound/atmel/ac97c.c: fix error return code	2012-08-20 10:56:01 +02:00
core	ALSA: Fix card refcount unbalance	2012-11-08 14:36:18 +01:00
drivers	ALSA: aloop - add locking to timer access	2012-10-06 16:50:28 +02:00
firewire	IEEE 1394 (FireWire) subsystem updates post v3.4:	2012-05-24 12:57:47 -07:00
i2c	ALSA: Fix typo in drivers sound	2012-11-04 09:20:58 +01:00
isa	ALSA: sound/isa/opti9xx/miro.c: eliminate possible double free	2012-10-21 14:17:43 +02:00
mips	ALSA: Convert mips directory to module_platform_driver	2011-11-24 13:03:02 +01:00
oss	ARM: SoC fixes	2012-10-11 10:21:48 +09:00
parisc
pci	ALSA: hda - Fix build without CONFIG_PM	2012-11-24 12:00:43 +01:00
pcmcia	ALSA: pdaudiocf: Remove superfluous pm_message_t argument from suspend	2012-07-03 08:23:08 +02:00
ppc	ALSA: sound/ppc/snd_ps3.c: fix error return code	2012-08-20 11:01:14 +02:00
sh	ALSA: Add missing .owner=THIS_MODULE to platform_driver definitions	2012-07-02 17:50:05 +02:00
soc	Linux 3.7-rc7	2012-11-25 21:34:34 -08:00
sparc	sound: Remove unnecessary semicolon	2012-10-06 16:47:53 +02:00
spi	ALSA: Convert at73c213 to module_spi_driver	2012-01-27 15:18:36 +01:00
synth
usb	ALSA: snd-usb: properly initialize the sync endpoint	2012-11-22 21:22:33 +01:00
ac97_bus.c
Kconfig
last.c	ALSA: Remove the last mention of SNDRV_MAIN_OBJECT_FILE	2012-09-03 10:07:23 +02:00
Makefile
sound_core.c	sound: allow the unit search until 256 in sound_core.c	2012-05-08 17:27:03 +02:00
sound_firmware.c	sound_firmware: don't pass crap to filp_close()	2012-07-29 21:24:22 +04:00