Merge branch 'merge' into next

Merge my own merge branch to get various fixes from there
and upstream, especially the hvc console tty refcouting fixes
which which testing is quite a bit harder...

Merge branch 'fortglx/3.8/time' of git://git.linaro.org/people/jstultz/linux into timers/core

Fix trivial conflicts in: kernel/time/tick-sched.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

Conflicts:
drivers/mtd/nand/nand_base.c

Merge branch 'devel/debug_ll_init' into zynq/multiplatform

Merge branches 'fix/arizona', 'fix/cs4271', 'fix/kirkwood' and 'fix/samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into tmp

Merge branch 'for-linus' into for-next

Merge the recent HD-audio codec change for fixing recursive suspend
calls.

Conflicts:
sound/pci/hda/hda_codec.c

Merge tag 'v3.7-rc6' into asoc-wm2200

Linux 3.7-rc6

Merge tag 'v3.7-rc6' into asoc-arizona

Linux 3.7-rc6

Conflicts:
sound/soc/codecs/wm5102.c

Merge branch 'next/dt-exynos4x12' into next/dt-samsung

Conflicts:
arch/arm/boot/dts/exynos4210.dtsi

Merge branch 'arch-frv' into no-rebases

Merge 3.7-rc6 into char-misc-next

Merge commit '6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d' into arch-arm64

Backmerge from mainline commit that introduced a trivial conflict in
arch/arm64/kernel/process.c - a bunch of functions remove

Merge commit '6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d' into arch-arm64

Backmerge from mainline commit that introduced a trivial conflict in
arch/arm64/kernel/process.c - a bunch of functions removed next to the
place where kernel_thread() used to be.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

show more ...

Merge tag 'v3.7-rc4'

Merge Linux 3.7-rc4 to get fixes for CMA.

Merge branch 'omap/dt' into next/drivers

Needed for the omap timer changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Merge tag 'omap-for-v3.8/fixes-non-critical-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

From Tony Lindgren <tony@atomide.com>:

Non cri

Merge tag 'omap-for-v3.8/fixes-non-critical-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

From Tony Lindgren <tony@atomide.com>:

Non critical omap fixes that were not considered urgent
for the -rc cycle.

* tag 'omap-for-v3.8/fixes-non-critical-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (645 commits)
ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n
ARM: OMAP4: retrigger localtimers after re-enabling gic
ARM: OMAP4460: Workaround for ROM bug because of CA9 r2pX GIC control register change.
ARM: OMAP4: PM: add errata support

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

show more ...

Merge tag 'v3.7-rc5' into devicetree/next

Linux 3.7-rc5

Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/fix/put' and 'regulator/fix/supp-volt' into tmp

Merge 3.7-rc5 into driver-core-next

Merge v3.7-rc5 into tty-next

This pulls in the 3.7-rc5 fixes into tty-next to make it easier to test.

Merge tag 'v3.7-rc5' into sched/core

Merge Linux 3.7-rc5, to pick up fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock

Merge 3.7-rc5 into usb-next

This pulls in the 3.7-rc5 branch into usb-next

Merge tag 'v3.7-rc5' into execve

Linux 3.7-rc5

Conflicts:
arch/arm64/kernel/process.c

Merge branch 'cleanups/dma' into next/cleanup

Separate patches from Marek Szyprowski <m.szyprowski@samsung.com>:

Commit e9da6e9905e639b0 ("ARM: dma-mapping: remove custom consistent dma
region") re

Merge branch 'cleanups/dma' into next/cleanup

Separate patches from Marek Szyprowski <m.szyprowski@samsung.com>:

Commit e9da6e9905e639b0 ("ARM: dma-mapping: remove custom consistent dma
region") replaced custom consistent memory handling, so setting
consistent dma memory size is not longer required. This patch series
cleans sub-architecture platform code to remove all calls to the
obsolated init_consistent_dma_size() function and finally removes the
init_consistent_dma_size() stub itself.

* cleanups/dma:
ARM: at91: remove obsoleted init_consistent_dma_size()
ARM: u300: remove obsoleted init_consistent_dma_size()
ARM: dma-mapping: remove init_consistent_dma_size() stub
ARM: shmobile: remove obsoleted init_consistent_dma_size()
ARM: davinci: remove obsoleted init_consistent_dma_size()
ARM: samsung: remove obsoleted init_consistent_dma_size()

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

show more ...

Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.7

A few small fixes plus a large but simple change for WM5102 which writes
out

Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.7

A few small fixes plus a large but simple change for WM5102 which writes
out a bunch of register updates to the device when we enable the clock
as recommended following chip evaluation.

show more ...