-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 11/27/12 17:00, Marek Vasut wrote: > Dear Tom Rini, > >> On Wed, Nov 28, 2012 at 02:43:54PM +0200, Pantelis Antoniou >> wrote: >>> usbdescriptors.h conflicts with linux/usb/ch9.h Remove it. >>> >>> Signed-off-by: Pantelis Antoniou >>> <pa...@antoniou-consulting.com> >> >> Seeing as this change is required to fix building of trats in >> u-boot-usb as well now, I am applying this now. Thanks! > > Only this or the whole series?
Only this patch. The rest of the series is new functionality that is past the merge window, so should be staged for the new MW. 1/9 fixes a bug exposed by Ilya's update. - -- Tom -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBAgAGBQJQtX6ZAAoJENk4IS6UOR1WoI8P/2K5SmZl6VVNWzeusp31nk7w mH4//X1+LfTg1oUX/v1xPTJGvpN8rEVcXZis/Q4HwymIEKHoG22OaP6SJqudo78P HQjz0jSgvsOcMZhobZVCp2UpuHhC/a6iBLBUAvyRDUfCtfVRZBJU17nalMM1oLps TyixMaHJYgCnU66WpNusTTK0qht9/tkjYEu1FmWJejngAKiwvbq1dZRsl+9qxB8L C4WHeh3Zw3AQa19yIqIGVMsHxE5vuO1KwW0cJlkmwcRaxObFZYluYoTpSGQGbVXk uVLbCerW/yNqmBmFGIHRAM5d5Uojoou5UdmGFfpHvYL4M/S4aHjHOXDjIEUa+Ef/ wpUpKN2WMMZUAaAzeQc9YNAr2bzNrpN5MruZ6bc+9Yr3w9vaFkcXWV5Mq5ZlgZEi CXfbDFqyJ7ODYG9cYt4i7YNczkjd0QGN1Oswqmorjd3nQ2QF+b7IAzJWAvh+KKC3 N/loGkZiI68LB3le22FJVKtOD6MPZUsrXQ6ms8lqezHMcve+uxw9F5f3k0HQTFts Q4zDdZ3JzcGjpl0bhQ6UJe4Pg/+xYzlij5eeCYD9WW8JIY1ZGxXrQuezYFUCn69J ed8NaTaZeUjqejOF3ucwIdR9ptnxZmdG6+6n4RDZEJTn8/K/9nfKpuEFyu9LkF6I KqfwCGTXhBwODdr0dE2Z =kS/y -----END PGP SIGNATURE----- _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot