History log of /openbmc/u-boot/include/usb_cdc_acm.h (Results 1 – 25 of 34)
Revision Date Author Comments
# e8f80a5a 09-May-2018 Tom Rini <trini@konsulko.com>

Merge git://git.denx.de/u-boot-sunxi


# 83d290c5 06-May-2018 Tom Rini <trini@konsulko.com>

SPDX: Convert all of our single license tags to Linux Kernel style

When U-Boot started using SPDX tags we were among the early adopters and
there weren't a lot of other examples to borro

SPDX: Convert all of our single license tags to Linux Kernel style

When U-Boot started using SPDX tags we were among the early adopters and
there weren't a lot of other examples to borrow from. So we picked the
area of the file that usually had a full license text and replaced it
with an appropriate SPDX-License-Identifier: entry. Since then, the
Linux Kernel has adopted SPDX tags and they place it as the very first
line in a file (except where shebangs are used, then it's second line)
and with slightly different comment styles than us.

In part due to community overlap, in part due to better tag visibility
and in part for other minor reasons, switch over to that style.

This commit changes all instances where we have a single declared
license in the tag as both the before and after are identical in tag
contents. There's also a few places where I found we did not have a tag
and have introduced one.

Signed-off-by: Tom Rini <trini@konsulko.com>

show more ...


# 3be2bdf5 09-Oct-2013 Tom Rini <trini@ti.com>

Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx


# 326ea986 31-Jul-2013 Stefano Babic <sbabic@denx.de>

Merge git://git.denx.de/u-boot-arm

Conflicts:
board/freescale/mx6qsabrelite/Makefile
board/freescale/mx6qsabrelite/mx6qsabrelite.c
include/configs/mx6qsab

Merge git://git.denx.de/u-boot-arm

Conflicts:
board/freescale/mx6qsabrelite/Makefile
board/freescale/mx6qsabrelite/mx6qsabrelite.c
include/configs/mx6qsabrelite.h

Signed-off-by: Stefano Babic <sbabic@denx.de>

show more ...


# 5b9c79a8 26-Jul-2013 Tom Rini <trini@ti.com>

Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash


# 8b485ba1 25-Jul-2013 Albert ARIBAUD <albert.u.boot@aribaud.net>

Merge branch 'u-boot/master' into u-boot-arm/master


# aaf5e825 25-Jul-2013 Tom Rini <trini@ti.com>

Merge branch 'master' of git://git.denx.de/u-boot-nds32


# c2120fbf 24-Jul-2013 Tom Rini <trini@ti.com>

Merge branch 'master' of git://git.denx.de/u-boot-i2c

The sandburst-specific i2c drivers have been deleted, conflict was just
over the SPDX conversion.

Conflicts:
bo

Merge branch 'master' of git://git.denx.de/u-boot-i2c

The sandburst-specific i2c drivers have been deleted, conflict was just
over the SPDX conversion.

Conflicts:
board/sandburst/common/ppc440gx_i2c.c
board/sandburst/common/ppc440gx_i2c.h

Signed-off-by: Tom Rini <trini@ti.com>

show more ...


# 1a459660 08-Jul-2013 Wolfgang Denk <wd@denx.de>

Add GPL-2.0+ SPDX-License-Identifier to source files

Signed-off-by: Wolfgang Denk <wd@denx.de>
[trini: Fixup common/cmd_io.c]
Signed-off-by: Tom Rini <trini@ti.com>


# b8685aff 22-Sep-2007 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

Merge git://www.denx.de/git/u-boot

Conflicts:

CREDITS


# 93f79834 21-Aug-2007 Stefan Roese <sr@denx.de>

Merge with /home/stefan/git/u-boot/u-boot-ppc4xx


# 19909edb 15-Aug-2007 Michal Simek <monstr@monstr.eu>

Merge git://www.denx.de/git/u-boot into merge


# b706d635 15-Aug-2007 Stefan Roese <sr@denx.de>

Merge with git://www.denx.de/git/u-boot.git


# d61ea148 15-Aug-2007 Stefan Roese <sr@denx.de>

Merge with git://www.denx.de/git/u-boot.git


# 3b3bff4c 14-Aug-2007 Stefan Roese <sr@denx.de>

Merge with git://www.denx.de/git/u-boot.git


# d1bc6c8d 13-Aug-2007 Ben Warren <bwarren@qstreams.com>

Sync'd u-boot-net with mainline

Merge git://www.denx.de/git/u-boot

Conflicts:

drivers/bcm570x.c
drivers/tigon3.c


# 375c2c9e 13-Aug-2007 Haavard Skinnemoen <hskinnemoen@atmel.com>

Merge commit 'upstream/master'


# 3a82d591 10-Aug-2007 Wolfgang Denk <wd@denx.de>

Merge with git+ssh://atlas/home/wd/git/u-boot/master


# b0d2962f 09-Aug-2007 Wolfgang Denk <wd@denx.de>

Merge with git+ssh://atlas/home/wd/git/u-boot/master


# 19901c63 09-Aug-2007 Wolfgang Denk <wd@denx.de>

Merge with /home/wd/git/u-boot/custodian/u-boot-usb


# 78549bbf 07-Aug-2007 Markus Klotzbuecher <mk@denx.de>

Merge with git://www.denx.de/git/u-boot.git


# c4e27534 06-Jun-2007 Markus Klotzbuecher <mk@denx.de>

Merge with git://www.denx.de/git/u-boot.git


# 51d8e813 29-May-2007 Markus Klotzbuecher <mk@denx.de>

Merge git://www.denx.de/git/u-boot into 2007_05_15-testing


# 6ede0c8b 07-May-2007 Markus Klotzbuecher <mk@denx.de>

Merge with git://www.denx.de/git/u-boot.git


# 61ea75aa 23-Apr-2007 Markus Klotzbuecher <mk@denx.de>

Merge with git://www.denx.de/git/u-boot.git


12