]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c71bd69 4faf4e0)
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Jun 2006 05:45:53 +0000 (22:45 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Jun 2006 05:45:53 +0000 (22:45 -0700)
* '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

1  2 
drivers/serial/Kconfig patch | diff1 | diff2 | blob | history

diff --cc drivers/serial/Kconfig
Simple merge
Linux 2.6 source tree