David Woodhouse 751851af7a Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ...

Conflicts:

	sound/pci/Kconfig

2008-07-14 15:51:11 -07:00

..

power

…

attribute_container.c

…

base.h

…

bus.c

…

class.c

…

core.c

…

cpu.c

…

dd.c

…

devres.c

…

dma-mapping.c

…

driver.c

…

firmware_class.c

firmware: allow firmware files to be built into kernel image

2008-07-10 14:30:13 +01:00

firmware.c

…

hypervisor.c

…

init.c

…

isa.c

…

Kconfig

firmware: Add CONFIG_FIRMWARE_IN_KERNEL option.

2008-07-10 14:47:20 +01:00

Makefile

…

map.c

…

memory.c

…

module.c

…

node.c

mm: switch node meminfo Active & Inactive pages to Kbytes

2008-07-04 10:40:09 -07:00

platform.c

…

sys.c

…

topology.c

x86: cleanup early per cpu variables/accesses v4

2008-07-08 11:31:20 +02:00

transport_class.c

…