aboutsummaryrefslogtreecommitdiffstats
path: root/arch
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 /arch
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq (diff)
parent[ARM] 3600/1: increase amba-pl010 UART_NR to 8 (diff)
downloadlinux-dev-0c97f524fc16004602f97ba19c36acdcc0fb9688.tar.xz
linux-dev-0c97f524fc16004602f97ba19c36acdcc0fb9688.zip
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 'arch')
0 files changed, 0 insertions, 0 deletions