summaryrefslogtreecommitdiff
path: root/arch/sparc/kernel/auxio_64.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-20 20:10:22 (GMT)
committerDavid S. Miller <davem@davemloft.net>2011-05-20 20:10:22 (GMT)
commit90d3ac15e5c637d45849e83c828ed78c62886737 (patch)
treec5568365f32386559d2710e8981ed41e5fe0eb12 /arch/sparc/kernel/auxio_64.c
parent9fafbd806198eb690c9a9f9fe35a879db93a1b8d (diff)
parent317f394160e9beb97d19a84c39b7e5eb3d7815a8 (diff)
downloadlinux-fsl-qoriq-90d3ac15e5c637d45849e83c828ed78c62886737.tar.xz
Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'
Conflicts: arch/sparc/kernel/smp_32.c With merge conflict help from Daniel Hellstrom. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/auxio_64.c')
0 files changed, 0 insertions, 0 deletions