Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit8c00b8ba00c6ce6a9c159ade2f93fb37992cf603
authorRalf Baechle <ralf@linux-mips.org>
Wed, 8 Mar 2006 12:04:32 +0000 (8 12:04 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 8 Mar 2006 12:04:32 +0000 (8 12:04 +0000)
treef143fdb9bb8d8085db52722635ceb3a577f4e424
parentd0322565f8d90df50532d9c0abe978649a0c48b3
parent7986824e4e31d6c66f39d2f11ab93fcfed21f593
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
drivers/serial/ip22zilog.c