Merge branch 'for_linus' of git://github.com/at91linux/linux-2.6-at91
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Dec 2010 17:45:25 +0000 (09:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Dec 2010 17:45:25 +0000 (09:45 -0800)
commitc15524a40a1603dc56a8691c4f50172fb86c23d8
treef1473650674ce565aa6442a9f366e6ce02a4cd47
parenta6ac1f0af4b39f41fa69477cc44621c612403374
parentc20b4dd31820a551d0fb60bf27b99345905c2eb6
Merge branch 'for_linus' of git://github.com/at91linux/linux-2.6-at91

* 'for_linus' of git://github.com/at91linux/linux-2.6-at91:
  at91: Refactor Stamp9G20 and PControl G20 board file
  at91: Fix uhpck clock rate in upll case