Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/…

…jejb/parisc-2.6.git/
git-mirror · Oct 16, 2012 · e114135 · e114135
2 parents dd8e8c4 + 7d55a5d
commit e114135
Show file tree

Hide file tree

Showing 23 changed files with 4 additions and 89 deletions.
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
@@ -1,6 +1,7 @@
 include include/asm-generic/Kbuild.asm
 
 header-y += pdc.h
-generic-y += clkdev.h
-generic-y += word-at-a-time.h
-generic-y += exec.h
+generic-y += word-at-a-time.h auxvec.h user.h cputime.h emergency-restart.h \
+	  segment.h topology.h vga.h device.h percpu.h hw_irq.h mutex.h \
+	  div64.h irq_regs.h kdebug.h kvm_para.h local64.h local.h param.h \
+	  poll.h xor.h clkdev.h exec.h
diff --git a/arch/parisc/include/asm/auxvec.h b/arch/parisc/include/asm/auxvec.h
diff --git a/arch/parisc/include/asm/compat_signal.h b/arch/parisc/include/asm/compat_signal.h
diff --git a/arch/parisc/include/asm/cputime.h b/arch/parisc/include/asm/cputime.h
diff --git a/arch/parisc/include/asm/device.h b/arch/parisc/include/asm/device.h
diff --git a/arch/parisc/include/asm/div64.h b/arch/parisc/include/asm/div64.h
diff --git a/arch/parisc/include/asm/emergency-restart.h b/arch/parisc/include/asm/emergency-restart.h
diff --git a/arch/parisc/include/asm/hw_irq.h b/arch/parisc/include/asm/hw_irq.h
diff --git a/arch/parisc/include/asm/irq_regs.h b/arch/parisc/include/asm/irq_regs.h
diff --git a/arch/parisc/include/asm/kdebug.h b/arch/parisc/include/asm/kdebug.h
diff --git a/arch/parisc/include/asm/kvm_para.h b/arch/parisc/include/asm/kvm_para.h
diff --git a/arch/parisc/include/asm/local.h b/arch/parisc/include/asm/local.h
diff --git a/arch/parisc/include/asm/local64.h b/arch/parisc/include/asm/local64.h
diff --git a/arch/parisc/include/asm/mutex.h b/arch/parisc/include/asm/mutex.h
diff --git a/arch/parisc/include/asm/param.h b/arch/parisc/include/asm/param.h
diff --git a/arch/parisc/include/asm/percpu.h b/arch/parisc/include/asm/percpu.h
diff --git a/arch/parisc/include/asm/poll.h b/arch/parisc/include/asm/poll.h
diff --git a/arch/parisc/include/asm/real.h b/arch/parisc/include/asm/real.h
diff --git a/arch/parisc/include/asm/segment.h b/arch/parisc/include/asm/segment.h
diff --git a/arch/parisc/include/asm/topology.h b/arch/parisc/include/asm/topology.h
diff --git a/arch/parisc/include/asm/user.h b/arch/parisc/include/asm/user.h
diff --git a/arch/parisc/include/asm/vga.h b/arch/parisc/include/asm/vga.h
diff --git a/arch/parisc/include/asm/xor.h b/arch/parisc/include/asm/xor.h