| #
2e483528 |
| 07-Jun-2011 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v3.0-rc1' into kbuild/kbuild
|
|
Revision tags: v3.0-rc2, 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
|
| #
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 ...
|
| #
a3ea8e8f |
| 02-May-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.
|
| #
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 |
|
| #
d5381e42 |
| 18-Apr-2011 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
|
| #
fac56c2d |
| 18-Apr-2011 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'v2.6.39-rc3' into for-2.6.39
|
| #
a84bd2ee |
| 14-Apr-2011 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
|
| #
32235b07 |
| 13-Apr-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Staging: merge 2.6.39-rc3 into staging-next
This was done to handle a number of conflicts, the majority of which
were caused by the big "fix spelling issues" patch.
Signed-off-by: Greg Kroah-Hartma
Staging: merge 2.6.39-rc3 into staging-next
This was done to handle a number of conflicts, the majority of which
were caused by the big "fix spelling issues" patch.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
|
Revision tags: v2.6.39-rc3 |
|
| #
1c01a80c |
| 11-Apr-2011 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
|
| #
42933bac |
| 07-Apr-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
|
|
Revision tags: v2.6.39-rc2 |
|
| #
25985edc |
| 31-Mar-2011 |
Lucas De Marchi <lucas.demarchi@profusion.mobi> |
Fix common misspellings
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
|
|
Revision tags: v2.6.39-rc1 |
|
| #
97eb3f24 |
| 19-Mar-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
|
|
Revision tags: v2.6.38 |
|
| #
2d8ad871 |
| 09-Mar-2011 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.38-rc1' into kbuild/packaging
|