Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

2 files changed, 3 insertions, 2 deletions

diff --git a/arch/m68k/mac/macboing.c b/arch/m68k/mac/macboing.c
index 05285d08e547..ffaa1f6439ae 100644
--- a/arch/m68k/mac/macboing.c
+++ b/arch/m68k/mac/macboing.c
@@ -114,7 +114,8 @@ static void mac_init_asc( void )
                          *   16-bit I/O functionality.  The PowerBook 500 series computers
                          *   support 16-bit stereo output, but only mono input."
                          *
-                         *   http://til.info.apple.com/techinfo.nsf/artnum/n16405
+                         *   Technical Information Library (TIL) article number 16405. 
+                         *   http://support.apple.com/kb/TA32601 
                          *
                          * --David Kilzer
                          */
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c
index ba6ccab64018..a4c3eb60706e 100644
--- a/arch/m68k/mac/psc.c
+++ b/arch/m68k/mac/psc.c
@@ -88,7 +88,7 @@ void __init psc_init(void)
 
         /*
          * The PSC is always at the same spot, but using psc
-         * keeps things consisant with the psc_xxxx functions.
+         * keeps things consistent with the psc_xxxx functions.
          */
 
         psc = (void *) PSC_BASE;