linux/drivers/of
Linus Torvalds d10902812c Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits)
  x86: Clean up apic.c and apic.h
  x86: Remove superflous goal definition of tsc_sync
  x86: dt: Correct local apic documentation in device tree bindings
  x86: dt: Cleanup local apic setup
  x86: dt: Fix OLPC=y/INTEL_CE=n build
  rtc: cmos: Add OF bindings
  x86: ce4100: Use OF to setup devices
  x86: ioapic: Add OF bindings for IO_APIC
  x86: dtb: Add generic bus probe
  x86: dtb: Add support for PCI devices backed by dtb nodes
  x86: dtb: Add device tree support for HPET
  x86: dtb: Add early parsing of IO_APIC
  x86: dtb: Add irq domain abstraction
  x86: dtb: Add a device tree for CE4100
  x86: Add device tree support
  x86: e820: Remove conditional early mapping in parse_e820_ext
  x86: OLPC: Make OLPC=n build again
  x86: OLPC: Remove extra OLPC_OPENFIRMWARE_DT indirection
  x86: OLPC: Cleanup config maze completely
  x86: OLPC: Hide OLPC_OPENFIRMWARE config switch
  ...

Fix up conflicts in arch/x86/platform/ce4100/ce4100.c
2011-03-15 20:01:36 -07:00
..
address.c of/address: use proper endianess in get_flags 2010-12-23 15:57:48 -07:00
base.c of: use __be32 types for big-endian device tree data 2010-10-12 21:58:42 -06:00
device.c of/device: Rework to use common platform_device_alloc() for allocating devices 2010-10-21 11:10:10 -06:00
fdt.c dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch() 2011-01-15 22:01:58 -07:00
gpio.c of/gpio: fix of_gpio includes 2010-07-05 16:14:44 -06:00
irq.c of/irq: remove references to NO_IRQ in drivers/of/platform.c 2010-10-12 21:58:27 -06:00
Kconfig x86: dtb: Add support for PCI devices backed by dtb nodes 2011-02-23 22:27:53 +01:00
Makefile of/pci: move of_irq_map_pci() into generic code 2011-02-04 11:46:50 -07:00
of_i2c.c of/i2c: Fix request module by alias 2010-12-24 01:28:54 -07:00
of_mdio.c of/mdio: Fix some endianness problems. 2010-12-24 01:25:54 -07:00
of_net.c of/net: Move of_get_mac_address() to a common source file. 2010-11-01 01:08:14 -04:00
of_pci.c x86: dtb: Add support for PCI devices backed by dtb nodes 2011-02-23 22:27:53 +01:00
of_spi.c of/spi: call of_register_spi_devices() from spi core code 2010-07-30 00:03:59 -06:00
pdt.c of/promtree: allow DT device matching by fixing 'name' brokenness (v5) 2011-03-02 13:45:19 -07:00
platform.c of/device: Don't register disabled devices 2011-01-03 16:02:49 -07:00