Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Jul 2010 20:18:05 +0000 (13:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Jul 2010 20:18:05 +0000 (13:18 -0700)
commit2decd5a7cea2c1dae6418fe778857d43680a91aa
tree2ff5a57ef9db7a5fc000d323910b13ece778ab5b
parentb4fd4f890bca2291a12bb0807027db40f929a82d
parent878c495644be28cc881e7ee792f00fd879a1ebf9
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