Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux...

diff --cc arch/powerpc/sysdev/fsl_soc.h
index 5a3dd480d2fd8eff791e62ae40e12de8a553b22a,25230ceffbcf05e5ca444019d8d7a188b3bd5eb4..04e145b5fc324066ebb52d2f895d8538270c3506
--- 1/arch/powerpc/sysdev/fsl_soc.h
--- 2/arch/powerpc/sysdev/fsl_soc.h
+++ b/arch/powerpc/sysdev/fsl_soc.h
@@@ -2,9 -2,9 +2,11 @@@
  #define __PPC_FSL_SOC_H
  #ifdef __KERNEL__
  
 +#include <asm/mmu.h>
 +
  extern phys_addr_t get_immrbase(void);
+ extern u32 get_brgfreq(void);
+ extern u32 get_baudrate(void);
  
  #endif
  #endif

diff --cc drivers/net/fs_enet/fs_enet-main.c
Simple merge