tree 2f5a8e84c33ae2df61e4e807798a153d6b7f6fbb
parent c44df7413fd711bca818111b94cbd7ce5f3600a9
parent c6557e7f2b6ae76a44653d38f835174074c42e05
author Linus Torvalds <torvalds@linux-foundation.org> 1217895307 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217895307 -0700

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/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