aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3/t3cdev.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-15 11:31:54 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-15 11:31:54 +1100
commit6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch)
tree06a5a9a08519950575505273eabced331ed51405 /drivers/net/cxgb3/t3cdev.h
parentee673eaa72d8d185012b1027a05e25aba18c267f (diff)
parent8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff)
downloadkernel_samsung_crespo-6dc6472581f693b5fc95aebedf67b4960fb85cf0.zip
kernel_samsung_crespo-6dc6472581f693b5fc95aebedf67b4960fb85cf0.tar.gz
kernel_samsung_crespo-6dc6472581f693b5fc95aebedf67b4960fb85cf0.tar.bz2
Merge commit 'origin'
Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h
Diffstat (limited to 'drivers/net/cxgb3/t3cdev.h')
-rw-r--r--drivers/net/cxgb3/t3cdev.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/cxgb3/t3cdev.h
index 0a21cfb..be55e9a 100644
--- a/drivers/net/cxgb3/t3cdev.h
+++ b/drivers/net/cxgb3/t3cdev.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2007 Chelsio Communications. All rights reserved.
+ * Copyright (C) 2006-2008 Chelsio Communications. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU