From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Aug 2010 17:54:04 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: MMI-PSA29.97-13-9~22559
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git390.marist.edu/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
---

2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8