From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 19 Jul 2010 20:18:05 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2decd5a7cea2c1dae6418fe778857d43680a91aa;p=deliverable%2Flinux.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] cio: fix potential overflow in chpid descriptor
  [S390] add missing device put
  [S390] dasd: use correct label location for diag fba disks
---

2decd5a7cea2c1dae6418fe778857d43680a91aa