#
fad837c1 |
| 10-Mar-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'v2.6.34-rc1' into for-2.6.35
|
#
e739cf1d |
| 09-Mar-2010 |
J. Bruce Fields <bfields@citi.umich.edu> |
Merge commit 'v2.6.34-rc1' into for-2.6.35-incoming
|
#
548b8416 |
| 09-Mar-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.34-rc1' into perf/urgent
Conflicts: tools/perf/util/probe-event.c
Merge reason: Pick up -rc1 and resolve the conflict as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
ce67eef6 |
| 09-Mar-2010 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.34-rc1' into for-linus
|
#
988addf8 |
| 08-Mar-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'origin' into devel-stable
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c
|
Revision tags: v2.6.34-rc1 |
|
#
f790c0ca |
| 08-Mar-2010 |
Patrick McHardy <kaber@trash.net> |
Merge branch 'master' of /repos/git/linux-2.6
Conflicts: net/ipv4/netfilter/nf_nat_core.c net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_netlink.c
Signed-off-by: Patrick McHardy <k
Merge branch 'master' of /repos/git/linux-2.6
Conflicts: net/ipv4/netfilter/nf_nat_core.c net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_netlink.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
show more ...
|
#
3fa04ecd |
| 05-Mar-2010 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34
|
#
e02c4fd3 |
| 04-Mar-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
|
#
d702d121 |
| 01-Mar-2010 |
Tony Lindgren <tony@atomide.com> |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts: arch/arm/plat-omap/Kconfig
|
#
e2f4699a |
| 01-Mar-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/rcu
Merge reason: Backmerge latest upstream to queue up dependent fix in the scheduler.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
47871889 |
| 01-Mar-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: drivers/firmware/iscsi_ibft.c
|
#
64d497f5 |
| 27-Feb-2010 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (187 commits) sh: remove dead LED code for migo-r and ms7724se sh
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (187 commits) sh: remove dead LED code for migo-r and ms7724se sh: ecovec build fix for CONFIG_I2C=n sh: ecovec r-standby support sh: ms7724se r-standby support sh: SH-Mobile R-standby register save/restore clocksource: Fix up a registration/IRQ race in the sh drivers. sh: ms7724: modify scan_timing for KEYSC sh: ms7724: Add sh_sir support sh: mach-ecovec24: Add sh_sir support sh: wire up SET/GET_UNALIGN_CTL. sh: allow alignment fault mode to be configured at kernel boot. sh: sh7724: Update FSI/SPU2 clock sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec sh: add sh7724 kick callback to clk_div4_table sh: introduce struct clk_div4_table sh: clock-cpg div4 set_rate() shift fix sh: Turn on speculative return for SH7785 and SH7786 sh: Merge legacy and dynamic PMB modes. sh: Use uncached I/O helpers in PMB setup. sh: Provide uncached I/O helpers. ...
show more ...
|
Revision tags: v2.6.33, v2.6.33-rc8, v2.6.33-rc7, v2.6.33-rc6 |
|
#
9d56dd3b |
| 26-Jan-2010 |
Paul Mundt <lethal@linux-sh.org> |
sh: Mass ctrl_in/outX to __raw_read/writeX conversion.
The old ctrl in/out routines are non-portable and unsuitable for cross-platform use. While drivers/sh has already been sanitized, there is stil
sh: Mass ctrl_in/outX to __raw_read/writeX conversion.
The old ctrl in/out routines are non-portable and unsuitable for cross-platform use. While drivers/sh has already been sanitized, there is still quite a lot of code that is not. This converts the arch/sh/ bits over, which permits us to flag the routines as deprecated whilst still building with -Werror for the architecture code, and to ensure that future users are not added.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
show more ...
|
Revision tags: v2.6.33-rc5, v2.6.33-rc4, v2.6.33-rc3, v2.6.33-rc2, v2.6.33-rc1, v2.6.32, v2.6.32-rc8, v2.6.32-rc7, v2.6.32-rc6, v2.6.32-rc5, v2.6.32-rc4, v2.6.32-rc3, v2.6.32-rc1, v2.6.32-rc2, v2.6.31, v2.6.31-rc9, v2.6.31-rc8, v2.6.31-rc7, v2.6.31-rc6, v2.6.31-rc5, v2.6.31-rc4, v2.6.31-rc3, v2.6.31-rc2, v2.6.31-rc1, v2.6.30, v2.6.30-rc8, v2.6.30-rc7, v2.6.30-rc6, v2.6.30-rc5, v2.6.30-rc4, v2.6.30-rc3, v2.6.30-rc2, v2.6.30-rc1, v2.6.29, v2.6.29-rc8, v2.6.29-rc7, v2.6.29-rc6, v2.6.29-rc5, v2.6.29-rc4, v2.6.29-rc3, v2.6.29-rc2, v2.6.29-rc1 |
|
#
a9de18eb |
| 31-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into stackprotector
Conflicts: arch/x86/include/asm/pda.h kernel/fork.c
|
Revision tags: v2.6.28 |
|
#
55fa5188 |
| 20-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/pcsp-fix' into topic/misc
|
#
0ff55519 |
| 19-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|
Revision tags: v2.6.28-rc9, v2.6.28-rc8, v2.6.28-rc7 |
|
#
7fbb8759 |
| 26-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc6' into core/debug
|
#
3e1d7a62 |
| 24-Nov-2008 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into core/futexes
|
Revision tags: v2.6.28-rc6, v2.6.28-rc5 |
|
#
a5a64498 |
| 10-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc4' into timers/rtc
Conflicts: drivers/rtc/rtc-cmos.c
|
Revision tags: v2.6.28-rc4, v2.6.28-rc3 |
|
#
7b3b6e42 |
| 31-Oct-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge commit 'v2.6.28-rc2' into topic/asoc
|
#
d1a76187 |
| 28-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into core/locking
Conflicts: arch/um/include/asm/system.h
|
#
7a9787e1 |
| 28-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
|
Revision tags: v2.6.28-rc2, v2.6.28-rc1 |
|
#
b2aaf8f7 |
| 15-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into stackprotector
Conflicts: arch/x86/kernel/Makefile include/asm-x86/pda.h
|
#
e21e696e |
| 06-Nov-2008 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
#
0a9b8638 |
| 27-Oct-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branches 'topic/fix/asoc', 'topic/fix/hda', 'topic/fix/misc' and 'topic/pci-ioremap-bar' into for-linus
|