diff --git a/[refs] b/[refs]
index cc7f1abd5d92..01718ca51dad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e08534b57e79fa722e3136b79868a725a8eea0f0
+refs/heads/master: 74b5127884d76ccbf4f445f650f9e969ccb4a374
diff --git a/trunk/drivers/net/can/pch_can.c b/trunk/drivers/net/can/pch_can.c
index d11fbb2b95ff..cc3ed57b6b15 100644
--- a/trunk/drivers/net/can/pch_can.c
+++ b/trunk/drivers/net/can/pch_can.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1999 - 2010 Intel Corporation.
- * Copyright (C) 2010 OKI SEMICONDUCTOR CO., LTD.
+ * Copyright (C) 2010 LAPIS SEMICONDUCTOR CO., LTD.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by