summaryrefslogtreecommitdiffstats
path: root/commands/global.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-10-03 21:12:48 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-10-03 21:12:48 +0200
commitd1e65d2a7bd9162e7009da870adb15c70b620320 (patch)
tree8eb7152b40e2f5868984f5f36cdfa142db53937c /commands/global.c
parentcd323c02240af01eb914c87d9d7c41db6e34984b (diff)
parent77322aa896895f4f68501a071086e432e575dcc2 (diff)
downloadbarebox-d1e65d2a7bd9162e7009da870adb15c70b620320.tar.gz
Merge branch 'for-next/remove-fsf-address'
Conflicts: drivers/net/miidev.c include/miidev.h
Diffstat (limited to 'commands/global.c')
-rw-r--r--commands/global.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/commands/global.c b/commands/global.c
index b7c3743..427a231 100644
--- a/commands/global.c
+++ b/commands/global.c
@@ -15,9 +15,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <common.h>
#include <malloc.h>