diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 06:31:05 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 06:31:05 +0200 |
commit | 075395d228641646159dae3dd170fa3fc6ff477a (patch) | |
tree | 7cd5ace653d722549b23a2594140084c49bfcad6 /drivers/net/smc-ultra32.c | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | [SERIAL] Ensure 8250_pci quirks are not marked __devinit (diff) | |
download | linux-075395d228641646159dae3dd170fa3fc6ff477a.tar.xz linux-075395d228641646159dae3dd170fa3fc6ff477a.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:
[SERIAL] Ensure 8250_pci quirks are not marked __devinit
[SERIAL] Convert fifosize to an unsigned int
Diffstat (limited to 'drivers/net/smc-ultra32.c')
0 files changed, 0 insertions, 0 deletions