Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Aug 2008 00:15:07 +0000 (17:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Aug 2008 00:15:07 +0000 (17:15 -0700)
commit5941de8eadc287f3f47b87ce9888734ee07d210b
tree2f5a8e84c33ae2df61e4e807798a153d6b7f6fbb
parentc44df7413fd711bca818111b94cbd7ce5f3600a9
parentc6557e7f2b6ae76a44653d38f835174074c42e05
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] move include/asm-s390 to arch/s390/include/asm