Merge branch 'master' of git://git.denx.de/u-boot-x86
authorWolfgang Denk <wd@denx.de>
Mon, 9 Apr 2012 14:54:11 +0000 (16:54 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 9 Apr 2012 14:54:11 +0000 (16:54 +0200)
commit8ec57a9dc1de46836bf8f81f0911b4bc26e0e6c7
treebd20bc9b9665a69d5dea67b2df2e821adb55bac2
parent35cf5fe51076fb0c8894b5875a8f55f230dd75c2
parent33d7b713227e8fa6f0332ffdaf13a666bdbc61aa
Merge branch 'master' of git://git.denx.de/u-boot-x86

* 'master' of git://git.denx.de/u-boot-x86:
  x86: Remove dead code in eNET