linux/Documentation/devicetree/bindings
Linus Torvalds 8da8533dfb Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
Pull EDAC patches from Mauro Carvalho Chehab:

 - the second part of the EDAC rework:
    - Add the sysfs nodes that exports the real memory layout, instead
      of the fake one (needed to properly represent Intel memory
      controllers since 2002)
    - convert EDAC MC to use "struct device" instead of creating the
      sysfs nodes via the kobj API
    - adds a tracepoint to represent memory errors

 - some cleanup patches

 - some fixes at i5000, i5400 and EDAC core

 - a new EDAC driver for Caldera.

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac: (33 commits)
  edac i5000, i5400: fix pointer math in i5000_get_mc_regs()
  edac: allow specifying the error count with fake_inject
  edac: add support for Calxeda highbank L2 cache ecc
  edac: add support for Calxeda highbank memory controller
  edac: create top-level debugfs directory
  sb_edac: properly handle error count
  i7core_edac: properly handle error count
  edac: edac_mc_handle_error(): add an error_count parameter
  edac: remove arch-specific parameter for the error handler
  amd64_edac: Don't pass driver name as an error parameter
  edac_mc: check for allocation failure in edac_mc_alloc()
  edac: Increase version to 3.0.0
  edac_mc: Cleanup per-dimm_info debug messages
  edac: Convert debugfX to edac_dbg(X,
  edac: Use more normal debugging macro style
  edac: Don't add __func__ or __FILE__ for debugf[0-9] msgs
  Edac: Add ABI Documentation for the new device nodes
  edac: move documentation ABI to ABI/testing/sysfs-devices-edac
  i7core_edac: change the mem allocation scheme to make Documentation/kobject.txt happy
  edac: change the mem allocation scheme to make Documentation/kobject.txt happy
  ...
2012-07-30 09:53:50 -07:00
..
arm Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac 2012-07-30 09:53:50 -07:00
ata ata: ahci_platform: Add synopsys ahci controller in DT's compatible list 2012-05-03 14:08:53 -04:00
c6x C6X: devicetree support 2011-10-06 19:47:33 -04:00
clock clk: add highbank clock support 2012-07-11 17:58:47 -07:00
crypto crypto: picoxcell - support for device tree matching 2011-08-10 19:00:26 +08:00
dma arm-soc: device tree conversions, part 2 2012-05-26 12:57:47 -07:00
fb video: mxsfb: add simple device tree probe 2012-07-03 13:22:37 +08:00
gpio Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux 2012-07-28 13:43:12 -07:00
hwmon hwmon: (ads1015) Make gain and datarate configurable 2011-03-21 17:59:37 +01:00
i2c I2C: MV64XYZ: Add Device Tree support 2012-07-23 22:04:11 +02:00
input Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2012-07-26 12:59:53 -07:00
iommu iommu/tegra: smmu: Add device tree support for SMMU 2012-06-25 13:50:43 +02:00
mfd regulator: tps65910: set input_supply on desc unconditionally 2012-07-17 11:08:46 +01:00
misc misc: at25: Parse dt settings 2012-06-14 17:23:04 -07:00
mmc arm-soc: general cleanups 2012-07-23 16:04:15 -07:00
mtd Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes 2012-07-25 21:37:09 +02:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-07-19 11:17:30 -07:00
nvec dt: name all Tegra binding docs consistently 2012-06-11 11:48:42 -06:00
pci
pinctrl Pin control changes for v3.6: 2012-07-24 14:05:46 -07:00
power_supply max17042_battery: Make it possible to instantiate driver from DT 2012-03-26 20:40:51 +04:00
powerpc powerpc: document the FSL MPIC message register binding 2012-03-16 16:15:28 -05:00
pwm pwm: add lpc32xx PWM support 2012-07-23 13:24:05 +02:00
regulator regulator: tps6586x: add support for input supply 2012-07-13 15:21:18 +01:00
rtc arm-soc: timer updates 2012-07-23 16:21:23 -07:00
serial Document: devicetree: add OF documents for arch-mmp 2012-03-07 09:32:52 +08:00
serio
sound dt: name all Tegra binding docs consistently 2012-06-11 11:48:42 -06:00
spi spi: Updates for 3.6 2012-07-26 12:57:41 -07:00
staging/iio/adc iio: Add device tree support to LPC32xx ADC 2012-04-24 11:04:07 -07:00
thermal drivers/thermal/spear_thermal.c: add Device Tree probing capability 2012-06-02 01:49:38 -04:00
tty/serial TTY/Serial patches for 3.6-rc1 2012-07-27 12:52:03 -07:00
usb USB patches for 3.6-rc1 2012-07-26 10:23:47 -07:00
video/backlight pwm-backlight: Add rudimentary device tree support 2012-07-23 13:23:52 +02:00
virtio virtio: Add platform bus driver for memory mapped virtio device 2011-11-02 11:41:01 +10:30
watchdog arm/dts: add wdt node for omap3 and omap4 2012-07-09 01:54:51 -07:00
x86
eeprom.txt
marvell.txt
open-pic.txt powerpc: Document the Open PIC device tree binding 2011-03-21 11:00:52 +11:00
resource-names.txt of/irq: Add interrupts-names property to name an irq resource 2012-01-04 00:33:15 -07:00
vendor-prefixes.txt of: Add Avionic Design vendor prefix 2012-06-13 13:34:39 -05:00
xilinx.txt