tree c6c19d30f3621725f61941d1de967c4351fb22f7
parent ee9b6d61a2a43c5952eb43283f8db284a4e70b8a
parent 022ae414daadb718130679e4eacc105521f11ec7
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1171303064 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1171303064 -0800

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] remove __io_virt and mmiowb.
  [S390] cio: use ARRAY_SIZE in device_id.c
  [S390] cio: Fixup interface for setting options on ccw devices.
  [S390] smp_call_function/smp_call_function_on locking.