summaryrefslogtreecommitdiff
path: root/include/linux/if_bridge.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-24 20:52:45 (GMT)
committerIngo Molnar <mingo@elte.hu>2009-02-24 20:52:45 (GMT)
commit0edcf8d6926f4038443dbc24e319530177ca0353 (patch)
tree6010af62f73d01ab673d5106f310eaf4f4228e32 /include/linux/if_bridge.h
parent87b203079ed949de52f0d92aeae20e5e0116c12f (diff)
parent40150d37be7f7949b2ec07d511244da856647d84 (diff)
downloadlinux-fsl-qoriq-0edcf8d6926f4038443dbc24e319530177ca0353.tar.xz
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Conflicts: arch/x86/include/asm/pgtable.h
Diffstat (limited to 'include/linux/if_bridge.h')
0 files changed, 0 insertions, 0 deletions