Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.

1 files changed, 12 insertions, 0 deletions

diff --git a/arch/arm/mach-pnx4008/Makefile b/arch/arm/mach-pnx4008/Makefile
new file mode 100644
index 00000000000..b457ca0a431
--- /dev/null
+++ b/arch/arm/mach-pnx4008/Makefile
@@ -0,0 +1,12 @@
+#
+# Makefile for the linux kernel.
+#
+
+obj-y                   := core.o irq.o time.o clock.o gpio.o serial.o dma.o
+obj-m                   :=
+obj-n                   :=
+obj-                    :=
+
+# Power Management
+obj-$(CONFIG_PM) += pm.o sleep.o
+