Revision tags: v3.3, v3.3-rc7, v3.3-rc6, v3.3-rc5, v3.3-rc4, v3.3-rc3, v3.3-rc2, v3.3-rc1, v3.2, v3.2-rc7, v3.2-rc6, v3.2-rc5, v3.2-rc4, v3.2-rc3, v3.2-rc2, v3.2-rc1, v3.1, v3.1-rc10, v3.1-rc9, v3.1-rc8, v3.1-rc7, v3.1-rc6, v3.1-rc5, v3.1-rc4, v3.1-rc3 |
|
#
94bd217e |
| 17-Aug-2011 |
Florian Tobias Schandinat <FlorianSchandinat@gmx.de> |
Merge commit 'v3.1-rc2' into HEAD
|
Revision tags: v3.1-rc2, v3.1-rc1 |
|
#
aa7eb8e7 |
| 27-Jul-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
|
#
a91f423e |
| 22-Jul-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus
|
Revision tags: v3.0, v3.0-rc7, v3.0-rc6, v3.0-rc5 |
|
#
74d83b7e |
| 23-Jun-2011 |
Nicholas Bellinger <nab@linux-iscsi.org> |
Merge tag 'v3.0-rc4' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
|
Revision tags: v3.0-rc4 |
|
#
1f2d9c9d |
| 16-Jun-2011 |
Patrick McHardy <kaber@trash.net> |
Merge branch 'master' of /repos/git/net-next-2.6
|
Revision tags: v3.0-rc3 |
|
#
5be5758c |
| 10-Jun-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply patches against new code I have in queue.
|
#
a61944c2 |
| 08-Jun-2011 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v3.0-rc1' into kbuild/kconfig
|
#
2e483528 |
| 07-Jun-2011 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v3.0-rc1' into kbuild/kbuild
|
#
aa72f689 |
| 06-Jun-2011 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-3.0' into for-3.1
|
Revision tags: v3.0-rc2 |
|
#
8181d3ef |
| 31-May-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
|
Revision tags: v3.0-rc1 |
|
#
6288cf1e |
| 29-May-2011 |
Len Brown <len.brown@intel.com> |
Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release
|
#
ea77f7a2 |
| 26-May-2011 |
Eric Paris <eparis@redhat.com> |
Merge commit 'v2.6.39' into 20110526
Conflicts: lib/flex_array.c security/selinux/avc.c security/selinux/hooks.c security/selinux/ss/policydb.c security/smack/smack_lsm.c
|
#
de66ee97 |
| 26-May-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/urgent
Merge reason: we want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
1102c660 |
| 26-May-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into perf/urgent
Merge reason: Linus applied an overlapping commit:
5f2e8e2b0bf0: kernel/watchdog.c: Use proper ANSI C prototypes
So merge it in to make sure we can iterate
Merge branch 'linus' into perf/urgent
Merge reason: Linus applied an overlapping commit:
5f2e8e2b0bf0: kernel/watchdog.c: Use proper ANSI C prototypes
So merge it in to make sure we can iterate the file without conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
#
5ca43f6c |
| 25-May-2011 |
Stephen Boyd <sboyd@codeaurora.org> |
lib: consolidate DEBUG_STACK_USAGE option
Most arches define CONFIG_DEBUG_STACK_USAGE exactly the same way. Move it to lib/Kconfig.debug so each arch doesn't have to define it. This obviously make
lib: consolidate DEBUG_STACK_USAGE option
Most arches define CONFIG_DEBUG_STACK_USAGE exactly the same way. Move it to lib/Kconfig.debug so each arch doesn't have to define it. This obviously makes the option generic, but that's fine because the config is already used in generic code.
It's not obvious to me that sysrq-P actually does anything caution by keeping the most inclusive wording.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Cc: Chris Metcalf <cmetcalf@tilera.com> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Richard Weinberger <richard@nod.at> Acked-by: Mike Frysinger <vapier@gentoo.org> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Hirokazu Takata <takata@linux-m32r.org> Acked-by: Ralf Baechle <ralf@linux-mips.org> Cc: Paul Mackerras <paulus@samba.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Chen Liqin <liqin.chen@sunplusct.com> Cc: Lennox Wu <lennox.wu@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
#
b73077eb |
| 24-May-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
|
#
78fab4c0 |
| 20-May-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.39' into spi/next
|
Revision tags: v2.6.39, v2.6.39-rc7, v2.6.39-rc6, v2.6.39-rc5 |
|
#
03351ff4 |
| 23-Apr-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.39-rc4' into next
|
#
d4ab4e6a |
| 19-Apr-2011 |
James Morris <jmorris@namei.org> |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
|
#
366a2382 |
| 23-May-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus
|
#
6b7b8e48 |
| 18-May-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into upstream.
This is sync with Linus' tree to receive KEY_IMAGES definition that went in through input tree.
|
#
a18f22a9 |
| 14-May-2011 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource
Conflicts: arch/ia64/kernel/cyclone.c arch/mips/kernel/i8253.c arch/x86/kernel/i8253.c
Rea
Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource
Conflicts: arch/ia64/kernel/cyclone.c arch/mips/kernel/i8253.c arch/x86/kernel/i8253.c
Reason: Resolve conflicts so further cleanups do not conflict further
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
show more ...
|
#
020abf03 |
| 10-May-2011 |
Stefan Richter <stefanr@s5r6.in-berlin.de> |
Merge tag 'v2.6.39-rc7'
in order to pull in changes in drivers/media/dvb/firewire/ and sound/firewire/.
|
#
4cb1f43c |
| 07-May-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.39-rc6' into x86/cleanups
Merge reason: move to a (much) newer upstream base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
ba67cf5c |
| 02-May-2011 |
Tejun Heo <tj@kernel.org> |
Merge branch 'x86/urgent' into x86-mm
Merge reason: Pick up the following two fix commits.
2be19102b7: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo() 765af22da8: x86-32, NUMA:
Merge branch 'x86/urgent' into x86-mm
Merge reason: Pick up the following two fix commits.
2be19102b7: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo() 765af22da8: x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change
Scheduled NUMA init 32/64bit unification changes depend on these.
Signed-off-by: Tejun Heo <tj@kernel.org>
show more ...
|