summaryrefslogtreecommitdiffstats
path: root/Documentation/networking/netdevices.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-03-09 17:11:53 +0100
committerIngo Molnar <mingo@elte.hu>2010-03-09 17:11:53 +0100
commit548b84166917d6f5e2296123b85ad24aecd3801d (patch)
tree0ab0300e23a02df0fe3c0579627e4998bb122c00 /Documentation/networking/netdevices.txt
parentMAINTAINERS: Add Arnaldo as tools/perf/ co-maintainer (diff)
parentLinux 2.6.34-rc1 (diff)
downloadlinux-548b84166917d6f5e2296123b85ad24aecd3801d.tar.xz
linux-548b84166917d6f5e2296123b85ad24aecd3801d.zip
Merge commit 'v2.6.34-rc1' into perf/urgent
Conflicts: tools/perf/util/probe-event.c Merge reason: Pick up -rc1 and resolve the conflict as well. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/networking/netdevices.txt')
0 files changed, 0 insertions, 0 deletions