summaryrefslogtreecommitdiff
path: root/include/linux/b1pcmcia.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-12-19 13:49:13 +0300
committerThomas Gleixner <tglx@linutronix.de>2015-12-19 13:49:13 +0300
commit0fa85119cd480c1ded7a81ed64f723fe16a15355 (patch)
tree8648434601c5112a1d9ab091ab11507fe88e0962 /include/linux/b1pcmcia.h
parentd6ccc3ec95251d8d3276f2900b59cbc468dd74f4 (diff)
parent1eab0e42450c6038e2bb17da438370fe639973f3 (diff)
downloadlinux-0fa85119cd480c1ded7a81ed64f723fe16a15355.tar.xz
Merge branch 'linus' into x86/cleanups
Pull in upstream changes so we can apply depending patches.
Diffstat (limited to 'include/linux/b1pcmcia.h')
0 files changed, 0 insertions, 0 deletions