summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/icn/icn.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-22 22:45:53 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-22 22:45:53 -0700
commit0c97f524fc16004602f97ba19c36acdcc0fb9688 (patch)
treec413a5d51dec3ddbe5f2e5cb0ea828976538168f /drivers/isdn/icn/icn.c
parentc71bd6944eb1458b7887af1783101f5a46140c40 (diff)
parent4faf4e0e7d4e1935fbfc5043d3ebd8d51a3d898d (diff)
Merge branch 'devel' of master.kernel.org:/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
Diffstat (limited to 'drivers/isdn/icn/icn.c')
0 files changed, 0 insertions, 0 deletions