#
bb803cfb |
| 19-May-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/scsi/fcoe/fcoe.c
|
#
74392592 |
| 17-May-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
Revision tags: v2.6.30-rc6 |
|
#
41fb454e |
| 11-May-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base, update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
7961386f |
| 11-May-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.30-rc5' into sched/core
Merge reason: sched/core was on .30-rc1 before, update to latest fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
7a309490 |
| 11-May-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.30-rc5' into x86/apic
Merge reason: this branch was on a .30-rc2 base - sync it up with all the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
Revision tags: v2.6.30-rc5 |
|
#
f066a155 |
| 08-May-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/urgent' into x86/xen
Conflicts: arch/frv/include/asm/pgtable.h arch/x86/include/asm/required-features.h arch/x86/xen/mmu.c
Merge reason: x86/xen was on a .29 base still, move i
Merge branch 'x86/urgent' into x86/xen
Conflicts: arch/frv/include/asm/pgtable.h arch/x86/include/asm/required-features.h arch/x86/xen/mmu.c
Merge reason: x86/xen was on a .29 base still, move it to a fresher branch and pick up Xen fixes as well, plus resolve conflicts
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
#
d2541170 |
| 08-May-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
#
44347d94 |
| 07-May-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by:
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
#
f3831a59 |
| 05-May-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'takashi/topic/asoc' into for-2.6.31
|
#
8560b932 |
| 04-May-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/asoc' into topic/asoc
|
#
3a20ac2c |
| 04-May-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
|
Revision tags: v2.6.30-rc4 |
|
#
e7fd5d4b |
| 29-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
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 ...
|
#
416dfdcd |
| 24-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
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 ...
|
Revision tags: v2.6.30-rc3 |
|
#
5bd3ef84 |
| 22-Apr-2009 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
|
#
8ecee462 |
| 21-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
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>
|
#
4db25d49 |
| 21-Apr-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/stable-updates' into sh/for-2.6.30
|
#
62d17029 |
| 20-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
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>
|
#
22fd67c5 |
| 19-Apr-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branches 'sh/earlytimer' and 'sh/shmobile-r2r-staging'
|
#
91ec65ba |
| 17-Apr-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
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 ...
|
#
5043124e |
| 17-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
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>
|
#
a54bfa40 |
| 17-Apr-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
|
#
0c387ec8 |
| 16-Apr-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
|
#
180deb50 |
| 15-Apr-2009 |
Jiri Slaby <jirislaby@gmail.com> |
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 ...
|
Revision tags: v2.6.30-rc2 |
|
#
05cfbd66 |
| 14-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
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>
|
#
b5c851a8 |
| 14-Apr-2009 |
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 ...
|