summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-05-26 22:01:26 -0400
committerJeff Garzik <jeff@garzik.org>2006-05-26 22:01:26 -0400
commit983f27d37d4fc72c252835cb2ee3103b360735a6 (patch)
tree8a7d3c3e251db494e285896debeb906473178a3e /MAINTAINERS
parentde1e938e54deba5b093a3074dfafd0d11afacbe1 (diff)
parente82b0f2cc21be905e504573483fa9542b15df96f (diff)
downloadlinux-stable-983f27d37d4fc72c252835cb2ee3103b360735a6.tar.gz
linux-stable-983f27d37d4fc72c252835cb2ee3103b360735a6.tar.bz2
linux-stable-983f27d37d4fc72c252835cb2ee3103b360735a6.zip
Merge branch 'upstream-fixes' into upstream
Conflicts: drivers/s390/net/ctctty.c
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions