| /linux/Documentation/ABI/testing/ |
| H A D | sysfs-cfq-target-latency | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| H A D | sysfs-block-rssd | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/Documentation/ABI/stable/ |
| H A D | sysfs-driver-usb-usbtmc | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/arch/um/drivers/ |
| H A D | cow_user.c | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| H A D | cow.h | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/drivers/block/mtip32xx/ |
| H A D | Kconfig | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/sound/pci/asihpi/ |
| H A D | hpios.c | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| H A D | hpi_internal.h | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/drivers/input/misc/ |
| H A D | da9052_onkey.c | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/drivers/input/touchscreen/ |
| H A D | tps6507x-ts.c | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/include/linux/ |
| H A D | stddef.h | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/arch/x86/ |
| H A D | Makefile.um | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/arch/arm/include/asm/ |
| H A D | jump_label.h | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/arch/x86/um/asm/ |
| H A D | barrier.h | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/arch/arm/boot/compressed/ |
| H A D | atags_to_fdt.c | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/drivers/gpio/ |
| H A D | gpio-sodaville.c | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/include/linux/amba/ |
| H A D | pl022.h | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/drivers/input/mouse/ |
| H A D | gpio_mouse.c | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/drivers/usb/host/ |
| H A D | uhci-hub.c | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/arch/x86/lib/ |
| H A D | usercopy.c | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/drivers/rtc/ |
| H A D | rtc-r9701.c | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| H A D | rtc-efi.c | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/arch/um/kernel/ |
| H A D | Makefile | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/fs/gfs2/ |
| H A D | Kconfig | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|
| /linux/drivers/hwmon/ |
| H A D | smsc47b397.c | diff d5efccd5b6843c504042735c1e20d9252daefd98 Mon Apr 16 20:40:27 CEST 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
|