summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 09:57:44 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 09:57:44 -0800
commitebaf0c6032f525ddb0158fb59848d41899dce8cd (patch)
treec6c19d30f3621725f61941d1de967c4351fb22f7 /Makefile
parentee9b6d61a2a43c5952eb43283f8db284a4e70b8a (diff)
parent022ae414daadb718130679e4eacc105521f11ec7 (diff)
downloadlinux-ebaf0c6032f525ddb0158fb59848d41899dce8cd.tar.bz2
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.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions