tree 2ff5a57ef9db7a5fc000d323910b13ece778ab5b
parent b4fd4f890bca2291a12bb0807027db40f929a82d
parent 878c495644be28cc881e7ee792f00fd879a1ebf9
author Linus Torvalds <torvalds@linux-foundation.org> 1279570685 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1279570685 -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] cio: fix potential overflow in chpid descriptor
  [S390] add missing device put
  [S390] dasd: use correct label location for diag fba disks