| #
eb42c758 |
| 12-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/crashdump
|
| #
708b8eae |
| 12-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/locking
|
| #
d06bbd66 |
| 12-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Conflicts:
kernel/trace/ring_buffer.c
|
| #
7e452baf |
| 12-Nov-2008 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/message/fusion/mptlan.c
drivers/net/sfc/ethtool.c
net/mac80211/debugfs_sta.c
|
| #
486936cd |
| 11-Nov-2008 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'linux-2.6' into next
|
| #
e892873c |
| 11-Nov-2008 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Update desktop/server defco
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Update desktop/server defconfigs
powerpc: Fix msr check in compat_sys_swapcontext
powerpc: Repair device bindings documentation
powerpc: Updated Freescale PPC related defconfigs
powerpc: Update QE/CPM2 usb_ctlr structures for USB support
powerpc/86xx: Correct SOC bus-frequency in GE Fanuc SBC610 DTS
powerpc: Fix Book-E watchdog timer interval setting
powerpc/fsl-booke: Fix synchronization bug w/local tlb invalidates
show more ...
|
|
Revision tags: v2.6.28-rc4 |
|
| #
ea37194d |
| 08-Nov-2008 |
Kumar Gala <galak@kernel.crashing.org> |
powerpc: Updated Freescale PPC related defconfigs
unset CONFIG_PCI_LEGACY in the defconfigs as none of them enable
ISDN drivers which seem to be the only place we are using pci_find_device
Signed-o
powerpc: Updated Freescale PPC related defconfigs
unset CONFIG_PCI_LEGACY in the defconfigs as none of them enable
ISDN drivers which seem to be the only place we are using pci_find_device
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
show more ...
|
|
Revision tags: v2.6.28-rc3 |
|
| #
7a9787e1 |
| 28-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
|
|
Revision tags: v2.6.28-rc2, v2.6.28-rc1 |
|
| #
b2aaf8f7 |
| 15-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into stackprotector
Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h
|
|
Revision tags: v2.6.27, v2.6.27-rc9, v2.6.27-rc8, v2.6.27-rc7 |
|
| #
6003ab0b |
| 10-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/debug
Conflicts:
lib/vsprintf.c
Manual merge:
include/linux/kernel.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
Revision tags: v2.6.27-rc6, v2.6.27-rc5, v2.6.27-rc4, v2.6.27-rc3, v2.6.27-rc2, v2.6.27-rc1, v2.6.26, v2.6.26-rc9 |
|
| #
5ce001b0 |
| 25-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into stackprotector
|
| #
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
|
| #
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
|
| #
620f2efc |
| 12-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/xsave
|
| #
6a4690c2 |
| 09-Oct-2008 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
|
| #
5a89770d |
| 07-Oct-2008 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
|
| #
35437b61 |
| 07-Oct-2008 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac', 'pxa-mp900', 'pxa-zylonite' and 'pxa-zaurus' into pxa-machines
Conflicts:
arch/arm/mach-pxa/poodle.c
|
| #
f68ec0c2 |
| 03-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into x86/setup
|
| #
56f68556 |
| 03-Oct-2008 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge unstable branch 'omap-rmk'
Merge branch 'omap-rmk' into omap-all
|
| #
d6d5aeb6 |
| 02-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into genirq
|
| #
59293c8a |
| 30-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
f78e8020 |
| 24-Sep-2008 |
Robert Richter <robert.richter@amd.com> |
Merge commit 'v2.6.27-rc5' into tip/oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
|
| #
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
|