summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-03 11:15:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-03 11:15:25 -0800
commit79051db9aedf7d169458a879accd1beda8f0cf8b (patch)
tree5fc7d94ed307dc5d31babc1cc802ccf3fb04507c /Makefile
parent9ddfd92909ac969758684e309e62198f549786a3 (diff)
parentd8951adeba05719b9efd7ce875a3294ffdbb37ea (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: at91sam9g45 family: identify several chip versions avr32: add two new at91 to cpu.h definition
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions