Merge commit 'origin'

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h
index 1b95b04c9257..29a33090d3d4 100644
--- a/drivers/net/via-velocity.h
+++ b/drivers/net/via-velocity.h
@@ -1381,7 +1381,7 @@ enum velocity_msg_level {
 #define ASSERT(x) { \
         if (!(x)) { \
                 printk(KERN_ERR "assertion %s failed: file %s line %d\n", #x,\
-                        __FUNCTION__, __LINE__);\
+                        __func__, __LINE__);\
                 BUG(); \
         }\
 }