From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 23 Jun 2006 05:45:53 +0000 (-0700)
Subject: Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: firefly_0821_release~35458^2~222
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0c97f524fc16004602f97ba19c36acdcc0fb9688;p=firefly-linux-kernel-4.4.55.git

Merge branch 'devel' of /home/rmk/linux-2.6-serial

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial:
  [ARM] 3600/1: increase amba-pl010 UART_NR to 8
  [ARM] 3571/1: netX: serial driver for Hilscher netX
---

0c97f524fc16004602f97ba19c36acdcc0fb9688