diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 21:31:05 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 21:31:05 -0700 |
commit | 075395d228641646159dae3dd170fa3fc6ff477a (patch) | |
tree | 7cd5ace653d722549b23a2594140084c49bfcad6 /drivers/acpi/scan.c | |
parent | 060ec6f2fb3c8abb85927758de8ac5d1018e6a43 (diff) | |
parent | 61a116ef29e712147d7ee7a6738886e6f91df5f5 (diff) | |
download | op-kernel-dev-075395d228641646159dae3dd170fa3fc6ff477a.zip op-kernel-dev-075395d228641646159dae3dd170fa3fc6ff477a.tar.gz |
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/acpi/scan.c')
0 files changed, 0 insertions, 0 deletions