|
Revision tags: v2.6.33-rc3 |
|
| #
32032df6 |
| 05-Jan-2010 |
Tejun Heo <tj@kernel.org> |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
|
|
Revision tags: v2.6.33-rc2, v2.6.33-rc1 |
|
| #
b8937162 |
| 14-Dec-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'next/isa' into topic/misc
|
| #
1ad1f10c |
| 09-Dec-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
| #
b7e56edb |
| 17-Feb-2010 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into x86/mm
x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.
Signed-off-by: Thomas Gleixner <tglx@linutronix
Merge branch 'linus' into x86/mm
x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
show more ...
|
| #
0ada0a73 |
| 28-Jan-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
|
| #
7f50548a |
| 26-Dec-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'v2.6.33-rc2' into for-2.6.33
|
| #
de8853bc |
| 21-Dec-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge remote branch 'alsa/fixes' into fix/hda
|
| #
4b4f887f |
| 21-Dec-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' into sh/hw-breakpoints
|
| #
7547a3e8 |
| 15-Dec-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'linus' into next
|
| #
709334c8 |
| 15-Dec-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
|
| #
559300bc |
| 14-Dec-2009 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge commit 'v2.6.32'
Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h
|
| #
bc7ecbcb |
| 13-Dec-2009 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
|
| #
b5c00a3a |
| 10-Dec-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.33
|
| #
4c68db38 |
| 09-Dec-2009 |
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>
|
| #
bcd6acd5 |
| 09-Dec-2009 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
|
| #
dad3de7d |
| 08-Dec-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: Add flag for dev
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: Add flag for devices capable of generating run-time wake-up events
PM / Runtime: Remove unnecessary braces in __pm_runtime_set_status()
PM / Runtime: Make documentation of runtime_idle() agree with the code
PM / Runtime: Ensure timer_expires is nonzero in pm_schedule_suspend()
PM / Runtime: Use deferred_resume flag in pm_request_resume
PM / Runtime: Export the PM runtime workqueue
PM / Runtime: Fix lockdep warning in __pm_runtime_set_status()
PM / Hibernate: Swap, use KERN_CONT
PM / Hibernate: Shift remaining code from swsusp.c to hibernate.c
PM / Hibernate: Move swap functions to kernel/power/swap.c.
PM / freezer: Don't get over-anxious while waiting
show more ...
|
| #
ec208491 |
| 08-Dec-2009 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Merge the BIOS workarounds from 2.6.32, and the swiotlb fallback on failure.
|
| #
f3d607c6 |
| 07-Dec-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/urgent
Merge reason: we want to queue up a dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
6548698f |
| 07-Dec-2009 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'v2.6.32' into reiserfs/kill-bkl
Merge-reason: The tree was based 2.6.31. It's better to be up to date
with 2.6.32. Although no conflicting changes were made in between,
it gives benchm
Merge commit 'v2.6.32' into reiserfs/kill-bkl
Merge-reason: The tree was based 2.6.31. It's better to be up to date
with 2.6.32. Although no conflicting changes were made in between,
it gives benchmarking results closer to the lastest kernel behaviour.
show more ...
|
| #
8e60c6a1 |
| 06-Dec-2009 |
Nigel Cunningham <nigel@tuxonice.net> |
PM / Hibernate: Shift remaining code from swsusp.c to hibernate.c
Shift the remaining declaration of the variable in_suspend and the
function swsusp_show_speed from swsusp.c to hibernate.c, and dele
PM / Hibernate: Shift remaining code from swsusp.c to hibernate.c
Shift the remaining declaration of the variable in_suspend and the
function swsusp_show_speed from swsusp.c to hibernate.c, and delete
swsusp.c.
Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
show more ...
|
| #
64357ed4 |
| 06-Dec-2009 |
Rafael J. Wysocki <rjw@sisk.pl> |
Merge branch 'master' into for-linus
|
| #
5cb2faa6 |
| 04-Dec-2009 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'pending-misc' (early part) into devel
|
| #
a6c872af |
| 03-Dec-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
220d0b1d |
| 03-Dec-2009 |
Jens Axboe <jens.axboe@oracle.com> |
Merge branch 'master' into for-2.6.33
|
| #
c84d6efd |
| 03-Dec-2009 |
James Morris <jmorris@macbook.(none)> |
Merge branch 'master' into next
|