Merge branch 'linus' into perfcounters/core

Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte

Merge branch 'linus' into perfcounters/core

Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.

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

show more ...

Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing

Conflicts:
arch/x86/kernel/ptrace.c

Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
dependency chan

Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing

Conflicts:
arch/x86/kernel/ptrace.c

Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
dependency change from upstream so that we can remove it
here.

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

show more ...

Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge

Merge branch 'linus' into x86/mm

Merge reason: refresh the topic: there's been 290 non-merges commits upstream
to arch/x86 alone.

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

Merge branch 'sh/stable-updates' into sh/for-2.6.30

Merge branch 'linus' into x86/urgent

Merge reason: We need the x86/uv updates from upstream, to queue up
dependent fix.

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

Merge branches 'sh/earlytimer' and 'sh/shmobile-r2r-staging'

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ads7846 - fix unsafe disable_

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ads7846 - fix unsafe disable_irq
Input: mainstone-wm97xx - fix condition in pen_up
Input: pc110pad - remove unused variable dev
Input: bf54x-keys - remove depreciated IRQF_SAMPLE_RANDOM flag
Input: ad7877, ad7879 - remove depreciated IRQF_SAMPLE_RANDOM flag
Input: da9034-ts - make pen {down,up} events more reliable
Input: da9034-ts - add Bin Yang as co-author of the driver
Input: atkbd - add forced release keys quirk for Samsung NC20
Input: atkbd - add forced release keys quirk for Samsung Q45
Input: gameport - fix attach driver code
Input: hp_sdc_rtc should depend on serio
Input: wm97xx - don't specify IRQF_SAMPLE_RANDOM
Input: ads7846 - introduce platform specific way to synchronize sampling
Input: remove unnecessary synchronize_rcu() call
Input: i8042 - add a DMI table for the i8042.reset option
Input: i8042 - introduce a tougher reset

show more ...

Merge branch 'linus' into x86/apic

Merge reason: new intr-remap patches depend on the s2ram iommu fixes from upstream

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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Merge branch 'next' into for-linus

Input: mainstone-wm97xx - fix condition in pen_up

The loop body was never executed, because the condition is
always false. Convert to for with more obvious condition.

Signed-off-by: Jiri Slaby <jir

Input: mainstone-wm97xx - fix condition in pen_up

The loop body was never executed, because the condition is
always false. Convert to for with more obvious condition.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

show more ...

Merge branch 'core/urgent' into core/rcu

Merge reason: new patches to be queued up depend on:

ef631b0: rcu: Make hierarchical RCU less IPI-happy

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

Merge branch 'linus' into tracing/core

Merge reason: merge latest tracing fixes to avoid conflicts in
kernel/trace/trace_events_filter.c with upcoming change

Signed-off-by: Ingo Molna

Merge branch 'linus' into tracing/core

Merge reason: merge latest tracing fixes to avoid conflicts in
kernel/trace/trace_events_filter.c with upcoming change

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

show more ...

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
MAINTAINERS

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (22 commits)
Input: i8042 - add HP D

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (22 commits)
Input: i8042 - add HP DV9700 to the noloop list
Input: arrange drivers/input/misc/Makefile in alphabetical order
Input: add AD7879 Touchscreen driver
Input: add AD7877 touchscreen driver
Input: bf54x-keys - fix typo in warning
Input: add driver for S1 button of rb532
Input: generic driver for rotary encoders on GPIOs
Input: hilkbd - fix crash when removing hilkbd module
Input: atkbd - add quirk for Fujitsu Siemens Amilo PA 1510
Input: atkbd - consolidate force release quirk setup
Input: add accelerated touchscreen support for Marvell Zylonite
Input: ucb1400_ts, mainstone-wm97xx - add BTN_TOUCH events
Input: wm97xx - use disable_irq_nosync() for Mainstone
Input: wm97xx - add BTN_TOUCH event to wm97xx to use it with Android
Input: fix polling of /proc/bus/input/devices
Input: psmouse - add newline to OLPC HGPK touchpad debugging
Input: ati_remote2 - check module params
Input: ati_remote2 - add per device attrs
Input: ati_remote2 - complete suspend support
Input: stop autorepeat timer on key release
...

show more ...

Merge branch 'next' into for-linus

Input: ucb1400_ts, mainstone-wm97xx - add BTN_TOUCH events

Add BTN_TOUCH event reporting to ucb1400_ts and accelerated mainstone-wm97xx
touchscreen drivers. Together with previously posted similar p

Input: ucb1400_ts, mainstone-wm97xx - add BTN_TOUCH events

Add BTN_TOUCH event reporting to ucb1400_ts and accelerated mainstone-wm97xx
touchscreen drivers. Together with previously posted similar patch for
wm97xx-core this will make all touchscreen drivers behave consistently wrt.
BTN_TOUCH.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

show more ...

Input: wm97xx - use disable_irq_nosync() for Mainstone

This should make no practical difference since the Mainstone can't be
SMP but it is more correct.

Signed-off-by: Mark Brown <broonie@opensourc

Input: wm97xx - use disable_irq_nosync() for Mainstone

This should make no practical difference since the Mainstone can't be
SMP but it is more correct.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

show more ...

Merge branch 'linus' into irq/genirq

Merge commit 'v2.6.29-rc1' into timers/hrtimers

Conflicts:
kernel/time/tick-common.c

Merge commit 'v2.6.29-rc1' into perfcounters/core

Conflicts:
include/linux/kernel_stat.h

Merge branch 'linus' into release

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6