Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5941de8e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c44df741 c6557e7f

include/asm-s390/Kbuild→arch/s390/include/asm/Kbuild

+0 −0

File moved.

View file

include/asm-s390/airq.h→arch/s390/include/asm/airq.h

+0 −0

File moved.

View file