path: root/drivers/serial/sh-sci.c
diff options
authorLinus Torvalds <>2008-03-10 18:45:51 -0700
committerLinus Torvalds <>2008-03-10 18:45:51 -0700
commit2f44bbb495dd3e6d0209eff2257438ab9c570e5b (patch)
tree5b65337043dd184b843e126226867a09fc7f4955 /drivers/serial/sh-sci.c
parent2b752acd91ecee926483b5f64a8f8bfe06e081fb (diff)
parent3db691daa4f6c4b899e144ea54a65738402c94e3 (diff)
Merge branch 'upstream-linus' of git://
* 'upstream-linus' of git:// [libata] Add support for the RB500 PATA CompactFlash ahci: logical-bitwise and confusion in ahci_save_initial_config() libata: don't allow sysfs read access to force param ahci: add the Device IDs for nvidia MCP7B AHCI libata-sff: handle controllers w/o ctl register libata: allow LLDs w/o any reset method ata: replace remaining __FUNCTION__ occurrences
Diffstat (limited to 'drivers/serial/sh-sci.c')
0 files changed, 0 insertions, 0 deletions