aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-i386/parport.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-19 23:04:26 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-19 23:04:26 -0400
commit511b00a3194167bad447d4c81027d6a44920dfd2 (patch)
tree080c076f994f701e40c03e7d5f7ce7f50115d2dc /include/asm-i386/parport.h
parentfbeb1f19229baa9ee80f315e9d24635045455082 (diff)
parent43a867a2d2a119c744bab6dc8d3e1da6809d7141 (diff)
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] zcrypt: fix possible race when unloading zcrypt driver modules [S390] zcrypt: fix possible dead lock in AP bus module [S390] Wire up sys_utimes. [S390] reboot from and dump to SCSI under z/VM fails. [S390] Wire up compat_sys_epoll_pwait. [S390] strlcpy is smart enough [S390] memory detection: fix off by one bug. [S390] cio: qdio slsb setup
Diffstat (limited to 'include/asm-i386/parport.h')
0 files changed, 0 insertions, 0 deletions