kernel-fxtec-pro1x/Documentation/devicetree/bindings
Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
arm Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-07-24 10:20:54 -07:00
ata
crypto dt: bindings: move SEC node under new crypto/ 2011-07-07 13:51:19 -06:00
fb Fix common misspellings 2011-03-31 11:26:23 -03:00
gpio gpio/tegra: dt: add binding for gpio polarity 2011-07-15 11:51:27 -06:00
hwmon hwmon: (ads1015) Make gain and datarate configurable 2011-03-21 17:59:37 +01:00
i2c x86: dtb: Add a device tree for CE4100 2011-02-23 22:27:52 +01:00
mmc Merge commit 'v2.6.38-rc8' into spi/next 2011-03-12 01:25:53 -07:00
mtd Fix common misspellings 2011-03-31 11:26:23 -03:00
net doc: powerpc: drop +x perms on text file 2011-06-27 16:39:34 +02:00
pci
powerpc dt: bindings: move SEC node under new crypto/ 2011-07-07 13:51:19 -06:00
rtc rtc: cmos: Add OF bindings 2011-02-23 22:27:55 +01:00
serial tty: serial: altera_jtaguart: Add device tree support 2011-03-01 09:38:27 -07:00
serio
spi spi/imx: add device tree probe support 2011-07-14 13:47:18 -06:00
tty/serial tty/serial: Add devicetree support for nVidia Tegra serial ports 2011-07-10 06:37:43 +09:00
usb
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
xilinx.txt