aboutsummaryrefslogtreecommitdiffstats
path: root/arch/avr32
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-18 16:21:43 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-18 16:21:43 -0400
commit7103dbed8e462f2a065381d23fde086cbd5b9891 (patch)
tree5ac7ca3994c08a9dd3368daa0df205aee1a3c063 /arch/avr32
parenta2b9c1f6208126e6df6c02428c501f8853685812 (diff)
parenta5602a3273774c720aaf165ff670e5b85e5910a5 (diff)
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: MIPS: Kludge IP27 build for 2.6.39. MIPS: AR7: Fix GPIO register size for Titan variant. MIPS: Fix duplicate invocation of notify_die. MIPS: RB532: Fix iomap resource size miscalculation.
Diffstat (limited to 'arch/avr32')
0 files changed, 0 insertions, 0 deletions