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)
* '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


Trivial merge