Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
authorKyle McMartin <kyle@parisc-linux.org>
Sat, 17 Feb 2007 05:18:23 +0000 (00:18 -0500)
committerKyle McMartin <kyle@parisc-linux.org>
Sat, 17 Feb 2007 05:18:23 +0000 (00:18 -0500)
commite7b3ca08549caccf5d6e1cf066780bf4f0ae77a7
tree7e5745bea06675cfce60d6813ee3b4d5e19cbb56
parent62d0cfcb27cf755cebdc93ca95dabc83608007cd
parentcb6efb39163bfb6bb6475fa7c8a5e08e44dbf14a
Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git

Conflicts:

arch/parisc/hpux/sys_hpux.c
arch/parisc/mm/ioremap.c
arch/parisc/hpux/sys_hpux.c
arch/parisc/kernel/smp.c
arch/parisc/mm/ioremap.c
drivers/net/Kconfig
drivers/serial/mux.c
scripts/mod/modpost.c