summaryrefslogtreecommitdiff
path: root/lib/locking-selftest-mutex.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2009-09-23 21:37:08 +0100
committerRalf Baechle <ralf@linux-mips.org>2009-09-30 21:46:59 +0200
commit0863be2e8ecc296df6f7fd7cb16e4929b727351d (patch)
tree10e4276a37fa7ea8c2b9e42011b77e7c45a28c87 /lib/locking-selftest-mutex.h
parent9fcd66e572b94974365a9119b073e0a43d496eb7 (diff)
MIPS: BCM1480: Re-apply patch lost due to bad resolution of merge conflict.
Patch 14275ccdb1e4b487cca745aba994699c426a31ee and d5dedd4507d307eb3f35f21b6e16f336fdc0d82a are conflicting and the conflict was resolved badly in merge 92241940be501f798cb21db344bbb3d1ec3c4f1c resulting in the BCM1480 changes of 14275ccdb1e4b487cca745aba994699c426a31ee getting lost. Sort out the damage. Reported and initial patch by Mark Mason <mmason@upwardaccess.com>. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'lib/locking-selftest-mutex.h')
0 files changed, 0 insertions, 0 deletions