tree 8e54da82410c8e57ff53b3d69d5760ff28bc236f
parent 1547ac893acbf87738ded0b470e2735fdfba6947
parent 2041f657aa4dc77afd63bbb34b34ed9476cf9ab9
author Linus Torvalds <torvalds@linux-foundation.org> 1281722044 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281722044 -0700

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

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] partitions: fix build error in ibm partition detection code
  [S390] appldata: fix dev_get_stats 64 bit conversion
  [S390] wire up prlimit64 and fanotify* syscalls
  [S390] zcrypt: fix Kconfig dependencies
  [S390] sys_personality: follow u_long to unsigned int conversion
  [S390] dasd: fix format string types