summaryrefslogtreecommitdiff
path: root/net/dccp
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-14 21:24:51 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-14 21:24:51 (GMT)
commit7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch)
tree0248fb8f7a3e445cc3c744252abeecabb9205c05 /net/dccp
parentb6825d2df55aa7d7341c715b577b73a6a03dc944 (diff)
parentd5120ae72a066b18f98e0c45ce73262f58030851 (diff)
downloadlinux-fsl-qoriq-7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4.tar.xz
Merge branch 's3c-move' into devel
Conflicts: arch/arm/mach-versatile/core.c
Diffstat (limited to 'net/dccp')
0 files changed, 0 insertions, 0 deletions