| #
5fdf7e59 |
| 31-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/kmemtrace
Conflicts:
mm/slub.c
|
| #
14a3c4ab |
| 31-Dec-2008 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
[ARM] pxafb: add support for overlay1 and overlay2 as frameb
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
[ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices
[ARM] pxafb: cleanup of the timing checking code
[ARM] pxafb: cleanup of the color format manipulation code
[ARM] pxafb: add palette format support for LCCR4_PAL_FOR_3
[ARM] pxafb: add support for FBIOPAN_DISPLAY by dma braching
[ARM] pxafb: allow pxafb_set_par() to start from arbitrary yoffset
[ARM] pxafb: allow video memory size to be configurable
[ARM] pxa: add document on the MFP design and how to use it
[ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
[ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant
[ARM] pxa/tavorevb: update board support (smartpanel LCD + keypad)
[ARM] pxa: Update eseries defconfig
[ARM] 5352/1: add w90p910-plat config file
[ARM] s3c: S3C options should depend on PLAT_S3C
[ARM] mv78xx0: implement GPIO and GPIO interrupt support
[ARM] Kirkwood: implement GPIO and GPIO interrupt support
[ARM] Orion: share GPIO IRQ handling code
[ARM] Orion: share GPIO handling code
[ARM] s3c: define __io using the typesafe version
[ARM] S3C64XX: Ensure CPU_V6 is selected
...
show more ...
|
|
Revision tags: v2.6.28 |
|
| #
55fa5188 |
| 20-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/pcsp-fix' into topic/misc
|
| #
a663a71e |
| 20-Dec-2008 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge git://git.marvell.com/orion into devel
|
|
Revision tags: v2.6.28-rc9, v2.6.28-rc8, v2.6.28-rc7, v2.6.28-rc6, v2.6.28-rc5, v2.6.28-rc4, v2.6.28-rc3, v2.6.28-rc2, v2.6.28-rc1 |
|
| #
9569dae7 |
| 20-Oct-2008 |
Lennert Buytenhek <buytenh@wantstofly.org> |
[ARM] Orion: share GPIO handling code
Split off Orion GPIO handling code into plat-orion/, and add
support for multiple sets of (32) GPIO pins.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com
[ARM] Orion: share GPIO handling code
Split off Orion GPIO handling code into plat-orion/, and add
support for multiple sets of (32) GPIO pins.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
show more ...
|
| #
0ff55519 |
| 19-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|
| #
7fbb8759 |
| 26-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc6' into core/debug
|
| #
3e1d7a62 |
| 24-Nov-2008 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into core/futexes
|
| #
7b3b6e42 |
| 31-Oct-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge commit 'v2.6.28-rc2' into topic/asoc
|
| #
d1a76187 |
| 28-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into core/locking
Conflicts:
arch/um/include/asm/system.h
|
| #
7a9787e1 |
| 28-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
|
| #
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, v2.6.27-rc6, v2.6.27-rc5, v2.6.27-rc4, v2.6.27-rc3, v2.6.27-rc2, v2.6.27-rc1 |
|
| #
3e370b29 |
| 18-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
drivers/pci/quirks.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
e21e696e |
| 06-Nov-2008 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
| #
d9214556 |
| 23-Oct-2008 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
|
| #
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 ...
|
| #
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
|
| #
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
|
| #
5fef06e8 |
| 16-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into genirq
|