Merge remote-tracking branch 'regulator/topic/stub' into regulator-next

Merge branches 'lpc32xx/mach-lpc32xx-eth' and 'lpc32xx/mach-lpc32xx-usb' of git://git.antcom.de/linux-2.6 into lpc32xx/drivers

* 'lpc32xx/mach-lpc32xx-eth' of git://git.antcom.de/linux-2.6:
ARM: L

Merge branches 'lpc32xx/mach-lpc32xx-eth' and 'lpc32xx/mach-lpc32xx-usb' of git://git.antcom.de/linux-2.6 into lpc32xx/drivers

* 'lpc32xx/mach-lpc32xx-eth' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: Ethernet support

* 'lpc32xx/mach-lpc32xx-usb' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: USB Support

(update to v3.3-rc6)

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

show more ...

drm: Merge tag 'v3.3-rc7' into drm-core-next

Merge the fixes so far into core-next, needed to test
intel driver.

Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c

Merge tag 'v3.3-rc7' into x86/platform

Merge reason: Update to the almost-final v3.3 kernel.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Merge tag 'v3.3-rc7' into x86/mce

Merge reason: Update from an ancient -rc1 base to an almost-final stable kernel.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into irq/core

Reason: Get upstream fixes integrated before further modifications.

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

Merge branch 'x86/cleanups' into perf/uprobes

Merge reason: We want to merge a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Merge tag 'v3.3-rc7' into gpio/next

Linux 3.3-rc7. Merged into the gpio branch to pick up gpio bugfixes already
in mainline before queueing up move v3.4 patches

Merge 3.3-rc6 into driver-core-next

This was done to resolve a conflict in the drivers/base/cpu.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Merge commit 'v3.3-rc6' into next

Merge commit 'v3.3-rc6'

Merge v3.3-rc6 to get the latest DSS and OMAP arch fixes.

Conflicts:
arch/arm/mach-omap1/board-innovator.c
drivers/video/omap2/dss/apply.c

Merge commit 'v3.3-rc6' into fbdev-next

Merge branch 'perf/urgent' into perf/core

Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/perf.h
tools/perf/util/top.h

Merge reason: resolve these cherry-picking conf

Merge branch 'perf/urgent' into perf/core

Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/perf.h
tools/perf/util/top.h

Merge reason: resolve these cherry-picking conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

show more ...

Merge tag 'tegra-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc2

From: Olof Johansson <olof@lixom.net>
Tegra 30 SMP support

I did this as a separate topic branch b

Merge tag 'tegra-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc2

From: Olof Johansson <olof@lixom.net>
Tegra 30 SMP support

I did this as a separate topic branch because it depends on both the
soc and the soc-drivers branch, so it brings both of those in as a base.

This branch contains work to enable SMP support on Tegra30 and reworks
some of the SMP bringup for T20 as well.

It also contains a device tree patch that builds on top of the SMP/clock
changes in the rest of the branch, so it made more sense to apply it
here than deal with the merge conflicts back and forth.

* tag 'tegra-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
ARM: dt: Explicitly configure all serial ports on Tegra Cardhu
ARM: tegra: support for secondary cores on Tegra30
ARM: tegra: support for Tegra30 CPU powerdomains
ARM: tegra: add support for Tegra30 powerdomains
ARM: tegra: export tegra_powergate_is_powered()
ARM: tegra: prepare powergate.c for multiple variants
ARM: tegra: rework Tegra secondary CPU core bringup
ARM: tegra: functions to access the flowcontroller
ARM: tegra: initialize Tegra chipid early
ARM: tegra: export Tegra chipid
ARM: tegra: cleanup use of chipid register

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

show more ...

Merge branch 'linus' into sched/core

Merge reason: we'll queue up dependent patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards

* 'board-specific' of git://github.com/hzhuang1/linux: (5 commits)
ARM: pxa: add dummy clock for pxa25x and pxa27x

Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards

* 'board-specific' of git://github.com/hzhuang1/linux: (5 commits)
ARM: pxa: add dummy clock for pxa25x and pxa27x
ARM: mmp: append irq name of gpio device
pxa/hx4700: Fix PXA_GPIO_IRQ_BASE/IRQ_NUM values
pxa/hx4700: Add ASIC3 LED support
pxa/hx4700: Correct StrataFlash block size discovery

(update to v3.3-rc5)

show more ...

Merge branch 'cleanup-3.4' of git://github.com/hzhuang1/linux into next/cleanup

* 'cleanup-3.4' of git://github.com/hzhuang1/linux: (2 commits)
rtc: sa1100: remove verification code of alarm
rtc

Merge branch 'cleanup-3.4' of git://github.com/hzhuang1/linux into next/cleanup

* 'cleanup-3.4' of git://github.com/hzhuang1/linux: (2 commits)
rtc: sa1100: remove verification code of alarm
rtc: sa1100: remove periodic code

(update to v3.3-rc5)

show more ...

Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc

* 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6: (2 commits)
ARM: defconfig: imx_v6

Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc

* 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6: (2 commits)
ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE
ARM: imx: update imx_v6_v7_defconfig

(upadte to v3.3-rc5)

show more ...

Merge branch 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

* 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6: (7 commits)
ARM: dts: imx6q-sabrelite: add vmmc-s

Merge branch 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

* 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6: (7 commits)
ARM: dts: imx6q-sabrelite: add vmmc-supply for usdhc
ARM: dts: imx6q-arm2: add vmmc-supply for usdhc
ARM: dts: imx51-babbage: update mc13892 device
ARM: dts: imx6q-sabrelite: add sgtl5000 audio codec
ARM: dts: imx6q-sabrelite: add 2p5v and 3p3v regulators
ARM i.MX5/6: Add dt support for generic boards
ARM: imx5: generate dtbs for imx5 boards

(update to Linux 3.3-rc5)

show more ...

Merge branch 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers

* 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6: (3 commits)
ARM: imx6q: add cko1 clo

Merge branch 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers

* 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6: (3 commits)
ARM: imx6q: add cko1 clock
ARM: mxc: make imx_dma_is_general_purpose more generic for sdma
ARM: imx6: Rename DEBUG_IMX6Q_UART to UART4

show more ...

Merge branch 'linus' into x86/asm

Sync up the latest NMI fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge

Merge branch 'lpc32xx/fixes-non-critical' of git://git.antcom.de/linux-2.6 into next/fixes-non-critical

* 'lpc32xx/fixes-non-critical' of git://git.antcom.de/linux-2.6: (1 commit)
ARM: LPC32xx: Fi

Merge branch 'lpc32xx/fixes-non-critical' of git://git.antcom.de/linux-2.6 into next/fixes-non-critical

* 'lpc32xx/fixes-non-critical' of git://git.antcom.de/linux-2.6: (1 commit)
ARM: LPC32xx: Fix missing and bad LPC32XX macros

Update to Linux 3.3-rc5

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

show more ...

Merge branch 'lpc32xx/fixes' of git://git.antcom.de/linux-2.6 into fixes

* 'lpc32xx/fixes' of git://git.antcom.de/linux-2.6: (5 commits)
ARM: LPC32xx: serial.c: Fixed loop limit
ARM: LPC32xx: se

Merge branch 'lpc32xx/fixes' of git://git.antcom.de/linux-2.6 into fixes

* 'lpc32xx/fixes' of git://git.antcom.de/linux-2.6: (5 commits)
ARM: LPC32xx: serial.c: Fixed loop limit
ARM: LPC32xx: serial.c: HW bug workaround
ARM: LPC32xx: irq.c: Clear latched event
ARM: LPC32xx: Fix interrupt controller init
ARM: LPC32xx: Fix irq on GPI_28

Update to Linux 3.3-rc5

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

show more ...

Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux