Merge 3.3-rc7 into usb-next

[~andy/linux] / tools / usb / ffs-test.c

diff --git a/tools/usb/ffs-test.c b/tools/usb/ffs-test.c
index b9c7986316997b4f820ed1567a71ff911ae3d107..53452c35d5e18e0352f54506c3fad51edd9e7686 100644 (file)
--- a/tools/usb/ffs-test.c
+++ b/tools/usb/ffs-test.c
@@ -2,7 +2,7 @@
  * ffs-test.c.c -- user mode filesystem api for usb composite function
  *
  * Copyright (C) 2010 Samsung Electronics
- *                    Author: Michal Nazarewicz <m.nazarewicz@samsung.com>
+ *                    Author: Michal Nazarewicz <mina86@mina86.com>
  *
  * 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