diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 07:45:53 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 07:45:53 +0200 |
commit | 0c97f524fc16004602f97ba19c36acdcc0fb9688 (patch) | |
tree | c413a5d51dec3ddbe5f2e5cb0ea828976538168f /include/asm-m32r/spinlock.h | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq (diff) | |
parent | [ARM] 3600/1: increase amba-pl010 UART_NR to 8 (diff) | |
download | linux-0c97f524fc16004602f97ba19c36acdcc0fb9688.tar.xz linux-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 'include/asm-m32r/spinlock.h')
0 files changed, 0 insertions, 0 deletions