1
0
Fork 0
alistair23-linux/drivers/pnp
Linus Torvalds 4522d58275 Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (156 commits)
  [PATCH] x86-64: Export smp_call_function_single
  [PATCH] i386: Clean up smp_tune_scheduling()
  [PATCH] unwinder: move .eh_frame to RODATA
  [PATCH] unwinder: fully support linker generated .eh_frame_hdr section
  [PATCH] x86-64: don't use set_irq_regs()
  [PATCH] x86-64: check vector in setup_ioapic_dest to verify if need setup_IO_APIC_irq
  [PATCH] x86-64: Make ix86 default to HIGHMEM4G instead of NOHIGHMEM
  [PATCH] i386: replace kmalloc+memset with kzalloc
  [PATCH] x86-64: remove remaining pc98 code
  [PATCH] x86-64: remove unused variable
  [PATCH] x86-64: Fix constraints in atomic_add_return()
  [PATCH] x86-64: fix asm constraints in i386 atomic_add_return
  [PATCH] x86-64: Correct documentation for bzImage protocol v2.05
  [PATCH] x86-64: replace kmalloc+memset with kzalloc in MTRR code
  [PATCH] x86-64: Fix numaq build error
  [PATCH] x86-64: include/asm-x86_64/cpufeature.h isn't a userspace header
  [PATCH] unwinder: Add debugging output to the Dwarf2 unwinder
  [PATCH] x86-64: Clarify error message in GART code
  [PATCH] x86-64: Fix interrupt race in idle callback (3rd try)
  [PATCH] x86-64: Remove unwind stack pointer alignment forcing again
  ...

Fixed conflict in include/linux/uaccess.h manually

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-12-07 08:59:11 -08:00
..
isapnp [POWERPC] Use check_legacy_ioport() for ISAPnP 2006-10-02 20:27:36 +10:00
pnpacpi Fix DMA resource allocation in ACPIPnP 2006-10-18 11:36:11 -07:00
pnpbios Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 2006-12-07 08:59:11 -08:00
Kconfig [ACPI] delete CONFIG_ACPI_BUS 2005-08-24 12:11:34 -04:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
base.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
card.c [PATCH] PNP: handle sysfs errors 2006-12-07 08:39:31 -08:00
core.c [PATCH] drivers/pnp/: cleanups 2005-11-07 07:54:09 -08:00
driver.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
interface.c [PATCH] PNP: handle sysfs errors 2006-12-07 08:39:31 -08:00
manager.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
quirks.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
resource.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
support.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
system.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00