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

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2007-03-19 20:04:26 -07:00

parent fbeb1f1922 43a867a2d2

commit 511b00a319

11 changed files with 87 additions and 31 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

26

drivers/s390/cio/qdio.c

View file

30

drivers/s390/crypto/ap_bus.c

View file

1

drivers/s390/crypto/ap_bus.h

View file

12

drivers/s390/crypto/zcrypt_api.c

View file