summaryrefslogtreecommitdiff
path: root/arch/m68k/amiga/pcmcia.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-03-01 09:26:41 (GMT)
committerIngo Molnar <mingo@elte.hu>2012-03-01 09:26:43 (GMT)
commit7e4d960993331e92567f0180e45322a93e6780ba (patch)
tree4d7444035303fc0b545e88afbd894176344fb2a3 /arch/m68k/amiga/pcmcia.c
parentde5bdff7a72acc281219be2b8edeeca1fd81c542 (diff)
parent164974a8f2a482f1abcb027c6d1a89dd79b14297 (diff)
downloadlinux-fsl-qoriq-7e4d960993331e92567f0180e45322a93e6780ba.tar.xz
Merge branch 'linus' into sched/core
Merge reason: we'll queue up dependent patches. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/amiga/pcmcia.c')
0 files changed, 0 insertions, 0 deletions