leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5841eb6402
linux/Documentation/devicetree/bindings
History
Linus Torvalds e0d65113a7 Merge git://git.infradead.org/mtd-2.6 
* git://git.infradead.org/mtd-2.6: (226 commits)
  mtd: tests: annotate as DANGEROUS in Kconfig
  mtd: tests: don't use mtd0 as a default
  mtd: clean up usage of MTD_DOCPROBE_ADDRESS
  jffs2: add compr=lzo and compr=zlib options
  jffs2: implement mount option parsing and compression overriding
  mtd: nand: initialize ops.mode
  mtd: provide an alias for the redboot module name
  mtd: m25p80: don't probe device which has status of 'disabled'
  mtd: nand_h1900 never worked
  mtd: Add DiskOnChip G3 support
  mtd: m25p80: add EON flash EN25Q32B into spi flash id table
  mtd: mark block device queue as non-rotational
  mtd: r852: make r852_pm_ops static
  mtd: m25p80: add support for at25df321a spi data flash
  mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
  mtd: nand: switch `check_pattern()' to standard `memcmp()'
  mtd: nand: invalidate cache on unaligned reads
  mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
  mtd: nand: wait to set BBT version
  mtd: nand: scrub BBT on ECC errors
  ...

Fix up trivial conflicts:
 - arch/arm/mach-at91/board-usb-a9260.c
	Merged into board-usb-a926x.c
 - drivers/mtd/maps/lantiq-flash.c
	add_mtd_partitions -> mtd_device_register vs changed to use
	mtd_device_parse_register.
2011-11-07 09:11:16 -08:00
..
arm Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 21:08:03 -07:00
ata ahci: add DT binding for Calxeda AHCI controller 2011-11-03 15:52:38 -05:00
crypto crypto: picoxcell - support for device tree matching 2011-08-10 19:00:26 +08:00
dma dmaengine: imx-sdma: add device tree probe support 2011-07-27 09:31:56 +08:00
fb Fix common misspellings 2011-03-31 11:26:23 -03:00
gpio Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6 2011-10-27 08:35:41 +02:00
hwmon hwmon: (ads1015) Make gain and datarate configurable 2011-03-21 17:59:37 +01:00
i2c Merge branches 'for-32/i2c/nomadik', 'for-32/i2c/s3c2410-dt' and 'for-32/i2c/tegra-iomem' into for-linus/i2c-3.2 2011-11-01 00:54:17 +00:00
input Input: mma8450 - add device tree probe support 2011-07-31 20:08:15 -07:00
mmc mmc: sdhci-tegra: Add 8-bit support to device tree binding. 2011-10-26 15:43:42 -04:00
mtd mtd: dataflash: add device tree probe support 2011-09-11 15:02:15 +03:00
net flexcan: Prefer device tree clock frequency if available. 2011-08-17 20:36:38 -07:00
pci
pinmux arm/dt: Tegra: Add pinmux node to tegra20.dtsi 2011-10-11 17:19:56 -07:00
powerpc powerpc/fsl_msi: add support for "msi-address-64" property 2011-10-14 02:54:29 -05:00
rtc x86, olpc: Add XO-1 RTC driver 2011-07-06 14:44:42 -07:00
serial tty/serial: RS485 bindings for device tree 2011-10-18 16:40:33 -07:00
serio
sound ASoC: Add device tree binding for WM8804 2011-08-31 09:52:57 +01:00
spi devicetree: Add ARM pl022 spi controller binding doc 2011-10-05 07:39:56 -05:00
tty/serial Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 21:02:35 -07:00
usb
virtio virtio: Add platform bus driver for memory mapped virtio device 2011-11-02 11:41:01 +10:30
watchdog watchdog: imx2_wdt: add device tree probe support 2011-07-26 21:19:16 +00:00
x86 x86: dt: Correct local apic documentation in device tree bindings 2011-02-28 09:58:06 +01:00
eeprom.txt
marvell.txt
open-pic.txt powerpc: Document the Open PIC device tree binding 2011-03-21 11:00:52 +11:00
vendor-prefixes.txt devicetree: Document Qualcomm and Atmel prefixes 2011-09-22 11:20:39 -06:00
xilinx.txt