On Tue, Apr 14, 2015 at 12:11:00PM -0600, Simon Glass wrote: > Hi Tom, > > Here are the driver model changes that have been queued up on > u-boot-dm/next. The main changes are: > > - Ethernet driver model support > - USB driver model support > - PCI driver model support > - Network cosmetic changes > - Masahiro's driver model Kconfig changes > - Chromebox panther support > - Moving cros_ec fully to driver model > - Moving various sandbox CONFIGs to Kconfig > > Since this has wide impact on the code base I'd like to get this in > early in the merge window to minimise the pain of rebase, etc.
So, yeah, rebase pain. Setting aside the USB scan changes (that're in as I didn't see u-boot-dfu included u-boot-usb, my fault), the rest of the USB conflicts are a little tricky too now that I read them harder. Please rebase and I'll grab it ASAP. Sorry! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
