#
02cee689 |
| 06-Nov-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.32-rc6' into next
|
#
a2e71271 |
| 04-Nov-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.32-rc6' into perf/core
Conflicts: tools/perf/Makefile
Merge reason: Resolve the conflict, merge to upstream and merge in perf fixes so we can add a dependent patch
Merge commit 'v2.6.32-rc6' into perf/core
Conflicts: tools/perf/Makefile
Merge reason: Resolve the conflict, merge to upstream and merge in perf fixes so we can add a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
#
b6d0137d |
| 04-Nov-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
2058297d |
| 03-Nov-2009 |
Jens Axboe <jens.axboe@oracle.com> |
Merge branch 'for-linus' into for-2.6.33
Conflicts: block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
|
Revision tags: v2.6.32-rc6 |
|
#
0a53f169 |
| 29-Oct-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/ppc64: Use preempt_schedule_irq
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/ppc64: Use preempt_schedule_irq instead of preempt_schedule powerpc: Minor cleanup to lib/Kconfig.debug powerpc: Minor cleanup to sound/ppc/Kconfig powerpc: Minor cleanup to init/Kconfig powerpc: Limit memory hotplug support to PPC64 Book-3S machines powerpc: Limit hugetlbfs support to PPC64 Book-3S machines powerpc: Fix compile errors found by new ppc64e_defconfig powerpc: Add a Book-3E 64-bit defconfig powerpc/booke: Fix xmon single step on PowerPC Book-E powerpc: Align vDSO base address powerpc: Fix segment mapping in vdso32 powerpc/iseries: Remove compiler version dependent hack powerpc/perf_events: Fix priority of MSR HV vs PR bits powerpc/5200: Update defconfigs drivers/serial/mpc52xx_uart.c: Use UPIO_MEM rather than SERIAL_IO_MEM powerpc/boot/dts: drop obsolete 'fsl5200-clocking' of: Remove nested function mpc5200: support for the MAN mpc5200 based board mucmc52 mpc5200: support for the MAN mpc5200 based board uc101
show more ...
|
#
fafbe983 |
| 16-Oct-2009 |
Kumar Gala <galak@kernel.crashing.org> |
powerpc: Add a Book-3E 64-bit defconfig
This defconfig's purpose at this time is to help catch compile errors between Book-3S and Book-3E support in ppc64. It is based on the ppc64_defconfig with s
powerpc: Add a Book-3E 64-bit defconfig
This defconfig's purpose at this time is to help catch compile errors between Book-3S and Book-3E support in ppc64. It is based on the ppc64_defconfig with some things disabled that we dont support on Book-3E right now (hugetlbfs, slices, etc.)
Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
show more ...
|