| #
057316cc |
| 23-Oct-2008 |
Len Brown <len.brown@intel.com> |
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Le
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Len Brown <len.brown@intel.com>
show more ...
|
| #
a02efb90 |
| 21-Oct-2008 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
|
| #
61e0e79e |
| 20-Oct-2008 |
David Vrabel <david.vrabel@csr.com> |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
|
| #
975f6b0c |
| 20-Oct-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branches 'topic/asoc', 'topic/misc-fixes', 'topic/ps3-csbits' and 'topic/staging-fixes' into for-linus
|
| #
b6a4b7de |
| 20-Oct-2008 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-hrtimer into timers/range-hrtimers
|
| #
c465a76a |
| 20-Oct-2008 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branches 'timers/clocksource', 'timers/hrtimers', 'timers/nohz', 'timers/ntp', 'timers/posixtimers' and 'timers/debug' into v28-timers-for-linus
|
| #
4cb40f79 |
| 20-Oct-2008 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
|
| #
3e10e879 |
| 19-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing-v28-for-linus-v3
Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl
|
| #
ed8c3174 |
| 18-Oct-2008 |
Anton Vorontsov <cbouatmailru@gmail.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/power/Makefile
|
| #
651dab42 |
| 17-Oct-2008 |
Arjan van de Ven <arjan@linux.intel.com> |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
|
| #
0f1f6dec |
| 17-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/urgent
|
| #
52f4f324 |
| 17-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/urgent
|
| #
923f7f69 |
| 16-Oct-2008 |
Jack Steiner <steiner@sgi.com> |
GRU driver: minor updates
A few minor updates for the GRU driver.
- documentation changes found in code reviews
- changes to #ifdefs to make them recognized by "unifdef"
(used in simulator test
GRU driver: minor updates
A few minor updates for the GRU driver.
- documentation changes found in code reviews
- changes to #ifdefs to make them recognized by "unifdef"
(used in simulator testing)
- change GRU context load/unload to prefetch data
[akpm@linux-foundation.org: fix typo in comment]
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
| #
accba5f3 |
| 13-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into oprofile-v2
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h
|
|
Revision tags: v2.6.27, v2.6.27-rc9 |
|
| #
f68ec0c2 |
| 03-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into x86/setup
|
| #
d6d5aeb6 |
| 02-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into genirq
|
|
Revision tags: v2.6.27-rc8 |
|
| #
e6aa0f07 |
| 24-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc7' into x86/microcode
|
| #
ebdd90a8 |
| 24-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc7' into x86/pebs
|
| #
0b88641f |
| 22-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc7' into x86/debug
|
|
Revision tags: v2.6.27-rc7 |
|
| #
83bd6998 |
| 14-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc6' into timers/hpet
|
|
Revision tags: v2.6.27-rc6, v2.6.27-rc5 |
|
| #
470fba7e |
| 21-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/doc
|
|
Revision tags: v2.6.27-rc4 |
|
| #
170465ee |
| 20-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/xen
|
| #
2879a927 |
| 19-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/oprofile' into oprofile
|
| #
f3efbe58 |
| 15-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/gart
|
| #
04197c83 |
| 15-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/tracehook
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|