Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6
[pandora-kernel.git] / kernel / mutex.c
diff --cc kernel/mutex.c
Simple merge