20130215/mips

diff --cc arch/ia64/kernel/ia64_ksyms.c
index 5b7791dd396556fc15827e895b43e2bace1a6bd1,5b7791dd396556fc15827e895b43e2bace1a6bd1..ca95c8b63f7d721ebd635a38d27c2853e9ddd62d
--- 1/arch/ia64/kernel/ia64_ksyms.c
--- 2/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
@@@ -25,7 -25,7 +25,6 @@@ EXPORT_SYMBOL(copy_page)
  
  #ifdef CONFIG_VIRTUAL_MEM_MAP
  #include <linux/bootmem.h>
--EXPORT_SYMBOL(min_low_pfn);   /* defined by bootmem.c, but not exported by generic code */
  EXPORT_SYMBOL(max_low_pfn);   /* defined by bootmem.c, but not exported by generic code */
  #endif
  

diff --cc arch/mips/kernel/traps.c
Simple merge