summaryrefslogtreecommitdiffstats
path: root/net/llc/llc_station.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 14:24:33 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 14:24:33 +0100
commit2e0e943436912ffe0848ece58167edfe754edb96 (patch)
treeb91919095c74742fa06e2105db6d859bee39b2b4 /net/llc/llc_station.c
parentMerge branches 'fixes' and 'misc' into for-linus (diff)
parentARM: 7269/1: mach-sa1100: fix sched_clock breakage (diff)
downloadlinux-2e0e943436912ffe0848ece58167edfe754edb96.tar.xz
linux-2e0e943436912ffe0848ece58167edfe754edb96.zip
Merge branch 'devel-stable' into for-linus
Conflicts: arch/arm/kernel/setup.c arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'net/llc/llc_station.c')
0 files changed, 0 insertions, 0 deletions