Commit 1ad1f10c authored by James Morris's avatar James Morris
Browse files

Merge branch 'master' into next

parents 08e3daff 2b876f95
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -55,4 +55,4 @@ Maintainers
  This board is maintained by Simtec Electronics.
  This board is maintained by Simtec Electronics.




(c) 2004 Ben Dooks, Simtec Electronics
Copyright 2004 Ben Dooks, Simtec Electronics
+1 −1
Original line number Original line Diff line number Diff line
@@ -134,4 +134,4 @@ Authour




Ben Dooks, 03 October 2004
Ben Dooks, 03 October 2004
(c) 2004 Ben Dooks, Simtec Electronics
Copyright 2004 Ben Dooks, Simtec Electronics
+1 −1
Original line number Original line Diff line number Diff line
@@ -299,4 +299,4 @@ Port Contributors
Document Author
Document Author
---------------
---------------


Ben Dooks, (c) 2004-2005,2006 Simtec Electronics
Ben Dooks, Copyright 2004-2006 Simtec Electronics
+1 −1
Original line number Original line Diff line number Diff line
@@ -117,4 +117,4 @@ ATA
Document Author
Document Author
---------------
---------------


Ben Dooks, (c) 2006 Simtec Electronics
Ben Dooks, Copyright 2006 Simtec Electronics
+1 −1
Original line number Original line Diff line number Diff line
@@ -18,4 +18,4 @@ Camera Interface
Document Author
Document Author
---------------
---------------


Ben Dooks, (c) 2006 Simtec Electronics
Ben Dooks, Copyright 2006 Simtec Electronics
Loading