git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
omap_device.c
diff --git
a/arch/arm/plat-omap/omap_device.c
b/arch/arm/plat-omap/omap_device.c
index
0f51974
..
f899603
100644
(file)
--- a/
arch/arm/plat-omap/omap_device.c
+++ b/
arch/arm/plat-omap/omap_device.c
@@
-2,10
+2,10
@@
* omap_device implementation
*
* Copyright (C) 2009 Nokia Corporation
* omap_device implementation
*
* Copyright (C) 2009 Nokia Corporation
- * Paul Walmsley
+ * Paul Walmsley
, Kevin Hilman
*
* Developed in collaboration with (alphabetical order): Benoit
*
* Developed in collaboration with (alphabetical order): Benoit
- * Cousson,
Kevin Hilman
, Tony Lindgren, Rajendra Nayak, Vikram
+ * Cousson,
Thara Gopinath
, Tony Lindgren, Rajendra Nayak, Vikram
* Pandita, Sakari Poussa, Anand Sawant, Santosh Shilimkar, Richard
* Woodruff
*
* Pandita, Sakari Poussa, Anand Sawant, Santosh Shilimkar, Richard
* Woodruff
*