Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Fri, 13 Nov 2015 15:02:43 +0000 (10:02 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 13 Nov 2015 15:02:43 +0000 (10:02 -0500)
commitb67dfc5a1099eef2a323de23a78ba4e6d9b87633
treee23ed37c2736481bd5cbf58f4d8aab57381005e9
parent439fcb9b4f717f5a583014acb3e75b789564867c
parent6d41027fe2e734aa1e15fabc1523417b3b871691
Merge branch 'master' of git://git.denx.de/u-boot-x86