History log of /linux/drivers/pnp/Makefile (Results 51 – 75 of 95)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v2.6.28
# 55fa5188 20-Dec-2008 Takashi Iwai <tiwai@suse.de>

Merge branch 'topic/pcsp-fix' into topic/misc


# 0ff55519 19-Dec-2008 Takashi Iwai <tiwai@suse.de>

Merge branch 'fix/hda' into topic/hda


Revision tags: v2.6.28-rc9
# e18d7af8 12-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc8' into x86/mm


Revision tags: v2.6.28-rc8, v2.6.28-rc7
# 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


Revision tags: v2.6.28-rc6, v2.6.28-rc5
# a5a64498 10-Nov-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc4' into timers/rtc

Conflicts:
drivers/rtc/rtc-cmos.c


Revision tags: v2.6.28-rc4, v2.6.28-rc3
# 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


# 2011a067 28-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc2' into x86/doc


# 7a9787e1 28-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks


# 5292ae11 27-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc2' into x86/uv


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


# e21e696e 06-Nov-2008 James Morris <jmorris@namei.org>

Merge branch 'master' into next


# 4944dd62 27-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc2' into tracing/urgent


# 8c82a17e 24-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc1' into sched/urgent


# 765426e8 23-Oct-2008 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (123 commits)
dock: ma

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (123 commits)
dock: make dock driver not a module
ACPI: fix ia64 build warning
ACPI: hack around sysfs warning with link order
ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n
intel_menlo: fix build warning
panasonic-laptop: fix build
ACPICA: Update version to 20080926
ACPICA: Add support for zero-length buffer-to-string conversions
ACPICA: New: Validation for predefined ACPI methods/objects
ACPICA: Fix for implicit return compatibility
ACPICA: Fixed a couple memory leaks associated with "implicit return"
ACPICA: Optimize buffer allocation procedure
ACPICA: Fix possible memory leak, error exit path
ACPICA: Fix fault after mem allocation failure in AML parser
ACPICA: Remove unused ACPI register bit definition
ACPICA: Update version to 20080829
ACPICA: Fix possible memory leak in acpi_ns_get_external_pathname
ACPICA: Cleanup for internal Reference Object
ACPICA: Update comments - no functional changes
ACPICA: Update for Reference ACPI_OPERAND_OBJECT
...

show more ...


# 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 ...


# 4dff4e7f 23-Oct-2008 Len Brown <len.brown@intel.com>

Merge branch 'pnp-debug' into test


# 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


1234