Merge branch 'linux-3.8.y' into ti-linux-3.8.y

* linux-3.8.y: (75 commits)
  Linux 3.8.4
  Revert "drm/i915: reorder setup sequence to have irqs for output setup"
  Revert "drm/i915: enable irqs earlier when resuming"
  6lowpan: Fix endianness issue in is_addr_link_local().
  dcbnl: fix various netlink info leaks
  rtnl: fix info leak on RTM_GETLINK request for VF devices
  bridge: fix mdb info leaks
  ipv6: stop multicast forwarding to process interface scoped addresses
  bridging: fix rx_handlers return code
  netlabel: correctly list all the static label mappings
  macvlan: Set IFF_UNICAST_FLT flag to prevent unnecessary promisc mode.
  team: unsyc the devices addresses when port is removed
  bonding: fire NETDEV_RELEASE event only on 0 slaves
  vxlan: fix oops when delete netns containing vxlan
  tun: add a missing nf_reset() in tun_net_xmit()
  tcp: fix double-counted receiver RTT when leaving receiver fast path
  net: ipv6: Don't purge default router if accept_ra=2
  rds: limit the size allocated by rds_message_alloc()
  atl1c: restore buffer state
  l2tp: Restore socket refcount when sendmsg succeeds
  ...

Signed-off-by: Dan Murphy <dmurphy@ti.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/tty/serial/of-serial.txt b/Documentation/devicetree/bindings/tty/serial/of-serial.txt
index 1e1145ca4f3c..8f01cb190f25 100644
--- a/Documentation/devicetree/bindings/tty/serial/of-serial.txt
+++ b/Documentation/devicetree/bindings/tty/serial/of-serial.txt
@@ -11,6 +11,9 @@ Required properties:
         - "nvidia,tegra20-uart"
         - "nxp,lpc3220-uart"
         - "ibm,qpace-nwp-serial"
+        - "altr,16550-FIFO32"
+        - "altr,16550-FIFO64"
+        - "altr,16550-FIFO128"
         - "serial" if the port type is unknown.
 - reg : offset and length of the register set for the device.
 - interrupts : should contain uart interrupt.