On Sat, May 24, 2014 at 3:34 PM, Stefan Herbrechtsmeier <ste...@herbrechtsmeier.net> wrote: > Am 22.05.2014 21:13, schrieb Bastien ROUCARIÈS: > >> MIME-Version: 1.0 >> Content-Type: text/plain; charset=UTF-8 >> Content-Transfer-Encoding: 8bit >> >> Hi, >> >> A rebase of an old patch set from Jamie Lentin. >> >> Source is available here: >> http://jamie.lentin.co.uk/devices/dlink-dns325/ >> >> Please apply >> >> Changelog: >> [V2] Use git option -M >> [V3] Fix a mismerge in boards.cfg >> >> Cc: Prafulla Wadaskar <prafu...@marvell.com> >> Cc: Jamie Lentin <j...@lentin.co.uk> >> Cc: Albert ARIBAUD <albert.u.b...@aribaud.net> >> Cc: Stefan Herbrechtsmeier <ste...@code.herbrechtsmeier.net> >> >> Jamie Lentin (4): >> kirkwood: Rename dns325 to dnskw >> kirkwood: Add support for the D-Link DNS-320 >> kirkwood: Set unused SD pins back to GPIO for DNS-320 & DNS-325 >> kirkwood: Shorten DNS-325 IDENT_STRING to match DNS-320 >> >> board/d-link/dns325/dns325.h | 32 ---- >> board/d-link/{dns325 => dnskw}/Makefile | 2 +- >> board/d-link/{dns325/dns325.c => dnskw/dnskw.c} | 30 +-- >> board/d-link/dnskw/dnskw.h | 42 +++++ >> board/d-link/dnskw/kwbimage.dns320.cfg | 207 >> +++++++++++++++++++++ >> .../kwbimage.cfg => dnskw/kwbimage.dns325.cfg} | 0 >> boards.cfg | 3 +- >> include/configs/{dns325.h => dnskw.h} | 23 ++- >> 8 files changed, 286 insertions(+), 53 deletions(-) >> delete mode 100644 board/d-link/dns325/dns325.h >> rename board/d-link/{dns325 => dnskw}/Makefile (93%) >> rename board/d-link/{dns325/dns325.c => dnskw/dnskw.c} (84%) >> create mode 100644 board/d-link/dnskw/dnskw.h >> create mode 100644 board/d-link/dnskw/kwbimage.dns320.cfg >> rename board/d-link/{dns325/kwbimage.cfg => dnskw/kwbimage.dns325.cfg} >> (100%) >> rename include/configs/{dns325.h => dnskw.h} (86%) >> > Tested-by: Stefan Herbrechtsmeier <ste...@herbrechtsmeier.net> > Acked-by: Stefan Herbrechtsmeier <ste...@herbrechtsmeier.net>
It was still not merged. Should I rebase ? _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
