git » linux-kernel » commit ffece48

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

author Linus Torvalds
2009-11-30 22:02:23 UTC
committer Linus Torvalds
2009-11-30 22:02:23 UTC
parent cd79bf7b1c061752dbee723bccf60c85d6c2d45d
parent be24656a5e2d68bfd0744f0742c4aceef2cf44b5

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.