summaryrefslogtreecommitdiffstats
path: root/include/linux/l2tp.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-07-31 14:19:35 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-31 14:19:35 +0100
commitb31fc7af78e17b0203e1cd5a195c590e8adeae0d (patch)
tree4032893d60c28e28a39bace2c48483352f626ba9 /include/linux/l2tp.h
parentf13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0 (diff)
parent4037242c4f5ff77afe61bf07ca1e8a99490219e5 (diff)
parenta0fb007bf0c7de9ae361a9ad3821df4c69d4d2d9 (diff)
parentcea0bb1bc59b94625e60b69aaa9ad6749d5b57dd (diff)
parent7d63397574c874a05e071987248c44fcf13eccf1 (diff)
parenta9deb137e4eb94d0a4fa0c3535b2c056d9363bef (diff)
parent39ae702cd3b8b9d30693b73ad1a3d74c799b5b1a (diff)
parentf4f5e28d2ee02e3b68da4a8b6156f3b4872d03be (diff)
parent7cfe249475fdd82ad3c2767a9b906cc775dab868 (diff)
parent4bd48940190a34fe5a78a1595ec7756edf36b18a (diff)
parenta3e5bb42898d10cff1d054d4b115d4dd608c0566 (diff)
Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', 'spear' and 'versatile' into devel