diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-07 18:04:54 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-07 18:04:54 -0800 |
commit | 7986824e4e31d6c66f39d2f11ab93fcfed21f593 (patch) | |
tree | 9ba2ea3d2a4a256e849697a7d757f8b544f4a016 /arch/mips/kernel/branch.c | |
parent | d423421cb3e924cf68da231a732c3250c80afa4e (diff) | |
parent | c4432c41b0c74d770ebc5e0a4fc3df3d00dfc131 (diff) | |
download | talos-obmc-linux-7986824e4e31d6c66f39d2f11ab93fcfed21f593.tar.gz talos-obmc-linux-7986824e4e31d6c66f39d2f11ab93fcfed21f593.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] ip22zilog: Fix oops on runlevel change with serial console
[SERIAL] Fix two bugs in parport_serial
Diffstat (limited to 'arch/mips/kernel/branch.c')
0 files changed, 0 insertions, 0 deletions