Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Aug 2008 20:54:43 +0000 (13:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Aug 2008 20:54:43 +0000 (13:54 -0700)
commit72e19b3b22f43b20ee84db0deba33c71803cbe34
tree2ca2ad35d0f01b0a808991ca3749060f8c382b24
parentf42ac38c59e0a03d6da0c24a63fb211393f484b0
parentdbe13d9981e55c60a030d0509acc9a8968b9c5bf
Merge branch 'for-linus' of git://git390.osdl.marist.edu/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] dcss: fix build bug.
  [S390] Fix linker script.