Merge branch 'mpc86xx'

diff --combined include/asm-ppc/processor.h
index 6e1d610c13081380c864de1583f6dc34ca8b8167,553ef3d9459e9d3c2173b0f8d4bfaff48bbb108a..e52d4b998abfe3204dc8e5c736145b12b656a1d7
--- 1/include/asm-ppc/processor.h
--- 2/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@@ -735,9 -735,7 +735,9 @@@
  #define PVR_440GP_RC  0x40120481
  #define PVR_440EP_RA  0x42221850
  #define PVR_440EP_RB  0x422218D3 /* 440EP rev B and 440GR rev A have same PVR */
 +#define PVR_440EP_RC  0x422218D4 /* 440EP rev C and 440GR rev B have same PVR */
  #define PVR_440GR_RA  0x422218D3 /* 440EP rev B and 440GR rev A have same PVR */
 +#define PVR_440GR_RB  0x422218D4 /* 440EP rev C and 440GR rev B have same PVR */
  #define PVR_440GX_RA  0x51B21850
  #define PVR_440GX_RB  0x51B21851
  #define PVR_440GX_RC  0x51B21892
@@@ -745,8 -743,6 +745,8 @@@
  #define PVR_405EP_RB  0x51210950
  #define PVR_440SP_RA  0x53221850
  #define PVR_440SP_RB  0x53221891
 +#define PVR_440SPe_RA 0x53421890
 +#define PVR_440SPe_RB 0x53421891
  #define PVR_601               0x00010000
  #define PVR_602               0x00050000
  #define PVR_603               0x00030000
@@@ -806,6 -802,8 +806,8 @@@
  #define SVR_VER(svr)  (((svr) >>  16) & 0xFFFF)       /* Version field */
  #define SVR_REV(svr)  (((svr) >>   0) & 0xFFFF)       /* Revison field */
  
+ #define SVR_SUBVER(svr)       (((svr) >>  8) & 0xFF)  /* Process/MFG sub-version */
+ 
  #define SVR_FAM(svr)  (((svr) >> 20) & 0xFFF) /* Family field */
  #define SVR_MEM(svr)  (((svr) >> 16) & 0xF)   /* Member field */
  
@@@ -823,9 -821,8 +825,8 @@@
  #define SVR_8541      0x807A
  #define SVR_8548      0x8031
  #define SVR_8548_E    0x8039
- 
  #define SVR_8641      0x8090
- #define SVR_8641D     0x8091
+ 
  
  /* I am just adding a single entry for 8260 boards.  I think we may be
   * able to combine mbx, fads, rpxlite, bseip, and classic into a single