#
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 ...
|
#
e1a0bdd8 |
| 02-Feb-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into upstream
Conflicts: drivers/hid/hid-ids.h
|
#
0ada0a73 |
| 28-Jan-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
|
#
6be32571 |
| 23-Jan-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
#
5958eed7 |
| 05-Jan-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
#
605c1a18 |
| 28-Dec-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
|
#
7f50548a |
| 26-Dec-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'v2.6.33-rc2' into for-2.6.33
|
#
193cb93e |
| 23-Dec-2009 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge branch 'master' of /home/gregkh/linux/git/torvalds-2.6
|
#
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
|
#
e0aa51f5 |
| 15-Dec-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
cc0104e8 |
| 14-Dec-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/urgent
Conflicts: kernel/trace/trace_kprobe.c
Merge reason: resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
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
|
#
09cea96c |
| 12-Dec-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (151 commits) powerpc: Fix usage of 64-bit
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (151 commits) powerpc: Fix usage of 64-bit instruction in 32-bit altivec code MAINTAINERS: Add PowerPC patterns powerpc/pseries: Track previous CPPR values to correctly EOI interrupts powerpc/pseries: Correct pseries/dlpar.c build break without CONFIG_SMP powerpc: Make "intspec" pointers in irq_host->xlate() const powerpc/8xx: DTLB Miss cleanup powerpc/8xx: Remove DIRTY pte handling in DTLB Error. powerpc/8xx: Start using dcbX instructions in various copy routines powerpc/8xx: Restore _PAGE_WRITETHRU powerpc/8xx: Add missing Guarded setting in DTLB Error. powerpc/8xx: Fixup DAR from buggy dcbX instructions. powerpc/8xx: Tag DAR with 0x00f0 to catch buggy instructions. powerpc/8xx: Update TLB asm so it behaves as linux mm expects. powerpc/8xx: Invalidate non present TLBs powerpc/pseries: Serialize cpu hotplug operations during deactivate Vs deallocate pseries/pseries: Add code to online/offline CPUs of a DLPAR node powerpc: stop_this_cpu: remove the cpu from the online map. powerpc/pseries: Add kernel based CPU DLPAR handling sysfs/cpu: Add probe/release files powerpc/pseries: Kernel DLPAR Infrastructure ...
show more ...
|
#
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 ...
|
Revision tags: v2.6.32, v2.6.32-rc8 |
|
#
46557bef |
| 18-Nov-2009 |
Dave Airlie <airlied@redhat.com> |
Merge branch 'drm-core-next' of ../linux-2.6 into drm-next
|
Revision tags: v2.6.32-rc7, v2.6.32-rc6 |
|
#
a0668cdc |
| 28-Oct-2009 |
David Gibson <david@gibson.dropbear.id.au> |
powerpc/mm: Cleanup management of kmem_caches for pagetables
Currently we have a fair bit of rather fiddly code to manage the various kmem_caches used to store page tables of various levels. We gen
powerpc/mm: Cleanup management of kmem_caches for pagetables
Currently we have a fair bit of rather fiddly code to manage the various kmem_caches used to store page tables of various levels. We generally have two caches holding some combination of PGD, PUD and PMD tables, plus several more for the special hugepage pagetables.
This patch cleans this all up by taking a different approach. Rather than the caches being designated as for PUDs or for hugeptes for 16M pages, the caches are simply allocated to be a specific size. Thus sharing of caches between different types/levels of pagetables happens naturally. The pagetable size, where needed, is passed around encoded in the same way as {PGD,PUD,PMD}_INDEX_SIZE; that is n where the pagetable contains 2^n pointers.
Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
show more ...
|
#
0f8f86c7 |
| 18-Oct-2009 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts: kernel/Makefile kernel/trace/Makefile kernel/trace/trace.h samples/Makefile
Merge reason: We need to be uptodate with the perf events
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts: kernel/Makefile kernel/trace/Makefile kernel/trace/trace.h samples/Makefile
Merge reason: We need to be uptodate with the perf events development branch because we plan to rewrite the breakpoints API on top of perf events.
show more ...
|
Revision tags: v2.6.32-rc5, v2.6.32-rc4 |
|
#
d94e5fcb |
| 06-Oct-2009 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge commit 'v2.6.32-rc3'
|
#
907bc6c7 |
| 06-Oct-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.32' into for-2.6.33
|
Revision tags: v2.6.32-rc3 |
|
#
1669b049 |
| 29-Sep-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
Revision tags: v2.6.32-rc1, v2.6.32-rc2 |
|
#
8b3f6af8 |
| 25-Sep-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/st
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/staging/cpc-usb/cpc.h drivers/staging/cpc-usb/cpc_int.h drivers/staging/cpc-usb/cpcusb.h
show more ...
|
#
d7a4b414 |
| 23-Sep-2009 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'linus/master' into tracing/kprobes
Conflicts: kernel/trace/Makefile kernel/trace/trace.h kernel/trace/trace_event_types.h kernel/trace/trace_export.c
Merge reason: Sync with late
Merge commit 'linus/master' into tracing/kprobes
Conflicts: kernel/trace/Makefile kernel/trace/trace.h kernel/trace/trace_event_types.h kernel/trace/trace_export.c
Merge reason: Sync with latest significant tracing core changes.
show more ...
|