Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
[pandora-kernel.git] / net / iucv / iucv.c
diff --cc net/iucv/iucv.c
Simple merge