summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-17 09:45:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-17 09:45:25 -0800
commitc15524a40a1603dc56a8691c4f50172fb86c23d8 (patch)
treef1473650674ce565aa6442a9f366e6ce02a4cd47 /net
parenta6ac1f0af4b39f41fa69477cc44621c612403374 (diff)
parentc20b4dd31820a551d0fb60bf27b99345905c2eb6 (diff)
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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions