| #
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
|
| #
b73077eb |
| 24-May-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
|
| #
9fb4c7fb |
| 24-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
|
| #
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 ...
|
| #
167f8297 |
| 27-Apr-2011 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'davinci-fixes' of git://gitorious.org/linux-davinci/linux-davinci into fixes
|
| #
31d44b57 |
| 26-Apr-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|
| #
07f9479a |
| 26-Apr-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
|
| #
eff430de |
| 22-Apr-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into perf/core
Merge reason: Pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
42ac9e87 |
| 21-Apr-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.39-rc4' into sched/core
Merge reason: Pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
03068ff1 |
| 19-Apr-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Staging: merge 2.6.39-rc4 into staging-next
This handles the removal of the samsung-laptop driver and other
minor merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
| #
68d2cf25 |
| 19-Apr-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'perf/urgent' into perf/core
Merge reason: we'll be queueing up dependent changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
Revision tags: v2.6.39-rc4 |
|
| #
280da4e4 |
| 17-Apr-2011 |
Richard Henderson <rth@twiddle.net> |
alpha: Remove set but unused variables.
This is a new warning in gcc 4.6. Several of these variables are
used within #if 0 code, which probably ought to be removed. Most
of the changes are legitim
alpha: Remove set but unused variables.
This is a new warning in gcc 4.6. Several of these variables are
used within #if 0 code, which probably ought to be removed. Most
of the changes are legitimate cleanups.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
| #
b32e3dc7 |
| 13-Apr-2011 |
Patrick McHardy <kaber@trash.net> |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
|
|
Revision tags: v2.6.39-rc3 |
|
| #
664cee46 |
| 09-Apr-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/asoc' into for-linus
|
|
Revision tags: v2.6.39-rc2 |
|
| #
09f68072 |
| 05-Apr-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
|
| #
4e29402f |
| 05-Apr-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
|
| #
f94f3cb3 |
| 03-Apr-2011 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.39' into for-2.6.40
|