| commit | 683aa4012f53b2ada0f430487e05d37b0d94e90a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Mar 31 21:36:51 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Mar 31 21:36:51 2006 -0800 |
| tree | 93585c38ae43f9bcbf2d38c2c2e2dd86b049af30 | |
| parent | 500156a0f0e81e24991f5f0db56e859db1fbdacf [diff] | |
| parent | 0cff260a42c051ee64c184ed05d96d18d243f7f6 [diff] |
Merge master.kernel.org:/home/rmk/linux-2.6-serial * master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] Allow 8250 PCI, PNP, GSC and HP300 support to be disabled