diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 23:02:23 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 23:02:23 +0100 |
commit | ffece4808d253131e910a0e0afada82f60b1980a (patch) | |
tree | 9b662b6809de1a6d9df54e7455af1960849b097c /arch/blackfin/mach-bf537/dma.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | sunsu: Use sunserial_console_termios() in sunsu_console_setup(). (diff) | |
download | linux-ffece4808d253131e910a0e0afada82f60b1980a.tar.xz linux-ffece4808d253131e910a0e0afada82f60b1980a.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sunsu: Use sunserial_console_termios() in sunsu_console_setup().
sunsu: Pass true 'ignore_line' to console match when RSC or LOM console.
serial: suncore: Fix RSC/LOM handling in sunserial_console_termios().
serial: suncore: Add 'ignore_line' argument to sunserial_console_match().
sunsu: Fix detection of SU ports which are RSC console or control.
sunsab: Do not set sunsab_reg.cons right before registering minors.
sparc64: Fix definition of VMEMMAP_SIZE.
Diffstat (limited to 'arch/blackfin/mach-bf537/dma.c')
0 files changed, 0 insertions, 0 deletions