Even more Brad/Realtek's merging. 

Applies on top of:
  2.6.0-test11
+ 2.6.0-test9-bk25-netdrvr-exp1
+ r8169-mac-phy-version
+ r8169-init_one

--
Ueimor