Manual merge with Linus.

Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c

1 files changed, 18 insertions, 0 deletions

diff --git a/arch/powerpc/math-emu/fabs.c b/arch/powerpc/math-emu/fabs.c
new file mode 100644
index 000000000000..41f0617f3d3a
--- /dev/null
+++ b/arch/powerpc/math-emu/fabs.c
@@ -0,0 +1,18 @@
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <asm/uaccess.h>
+
+int
+fabs(u32 *frD, u32 *frB)
+{
+        frD[0] = frB[0] & 0x7fffffff;
+        frD[1] = frB[1];
+
+#ifdef DEBUG
+        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
+        dump_double(frD);
+        printk("\n");
+#endif
+
+        return 0;
+}