Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Mar 2011 00:28:10 +0000 (17:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Mar 2011 00:28:10 +0000 (17:28 -0700)
commit4c5811bf463b0ef82fabbd1708f8bb2d753aeb18
treeff37d31217c3804ca05de21a55a9b5ca1ca818b2
parentf74b9444192c60603020c61d7915b72893137edc
parent9f15444fefdb33509132ff5c9be60cb315c44cb2
Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6: (21 commits)
  tty: serial: altera_jtaguart: Add device tree support
  tty: serial: altera_uart: Add devicetree support
  dt: eliminate of_platform_driver shim code
  dt: Eliminate of_platform_{,un}register_driver
  dt/serial: Eliminate users of of_platform_{,un}register_driver
  dt/usb: Eliminate users of of_platform_{,un}register_driver
  dt/video: Eliminate users of of_platform_{,un}register_driver
  dt/net: Eliminate users of of_platform_{,un}register_driver
  dt/sound: Eliminate users of of_platform_{,un}register_driver
  dt/spi: Eliminate users of of_platform_{,un}register_driver
  dt: uartlite: merge platform and of_platform driver bindings
  dt: xilinx_hwicap: merge platform and of_platform driver bindings
  ipmi: convert OF driver to platform driver
  leds/leds-gpio: merge platform_driver with of_platform_driver
  dt/sparc: Eliminate users of of_platform_{,un}register_driver
  dt/powerpc: Eliminate users of of_platform_{,un}register_driver
  dt/powerpc: move of_bus_type infrastructure to ibmebus
  drivercore/dt: add a match table pointer to struct device
  dt: Typo fix.
  altera_ps2: Add devicetree support
  ...
14 files changed:
arch/sparc/kernel/time_32.c
drivers/ata/sata_dwc_460ex.c
drivers/ata/sata_fsl.c
drivers/char/ipmi/ipmi_si_intf.c
drivers/rtc/rtc-mpc5121.c
drivers/tty/serial/altera_jtaguart.c
drivers/tty/serial/altera_uart.c
drivers/tty/serial/of_serial.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-xilinx-of.c
drivers/usb/host/ohci-hcd.c
drivers/watchdog/cpwd.c
include/linux/device.h
include/linux/of.h