Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jan 2012 17:02:10 +0000 (09:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jan 2012 17:02:10 +0000 (09:02 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  [S390] dasd: revalidate server for new pathgroup
  [S390] dasd: revert LCU optimization
  [S390] cleanup entry point definition


Trivial merge