summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-08-17 11:18:39 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-08-17 11:18:39 +1000
commit464abe705cfaa955e3210c27533d740758ac4ac7 (patch)
treeeea884bc3bbd55cefb4cc64f8ee7d1a9d2892dec /MAINTAINERS
parent746c35e8d0c612231e661def62cda3b298e67ecf (diff)
parent944afcb4c53f3b841d63ce337fe37b71cea2f52f (diff)
Merge remote branch 'xtensa/master'
Conflicts: arch/xtensa/configs/iss_defconfig
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions