Merge remote-tracking branch 'origin/master'

This commit is contained in:
Lok Tep
2016-06-25 18:32:41 +02:00
4 changed files with 7 additions and 7 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
/************************************************************************************ /************************************************************************************
* arch/arm/src/stm32f7/chip/stm32_i2c.h * arch/arm/src/stm32f7/chip/stm32_sdmmc.h
* *
* Copyright (C) 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -1,7 +1,7 @@
/************************************************************************************ /************************************************************************************
* arch/arm/src/stm32f7/chip/stm32_sdio.h * arch/arm/src/stm32f7/chip/stm32_sdmmc.h
* *
* Copyright (C) 2009, 2011-2013 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
+1 -1
View File
@@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/stm32f7/stm32_sdio.c * arch/arm/src/stm32f7/stm32_sdmmc.c
* *
* Copyright (C) 2009, 2011-2016 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
+2 -2
View File
@@ -1,7 +1,7 @@
/************************************************************************************ /************************************************************************************
* arch/arm/src/stm32f7/stm32_sdio.h * arch/arm/src/stm32f7/stm32_sdmmc.h
* *
* Copyright (C) 2009, 2011, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without