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

Commit 2b12a4c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Move include/asm-ia64 to arch/ia64/include/asm
parents 4744b434 7f30491c

include/asm-ia64/Kbuild→arch/ia64/include/asm/Kbuild

+0 −0

File moved.

View file

include/asm-ia64/a.out.h→arch/ia64/include/asm/a.out.h

+0 −0

File moved.

View file

include/asm-ia64/acpi.h→arch/ia64/include/asm/acpi.h

+0 −2
Original line number Diff line number Diff line 
/*

 *  asm-ia64/acpi.h

 *

 *  Copyright (C) 1999 VA Linux Systems

 *  Copyright (C) 1999 Walt Drummond <drummond@valinux.com>

 *  Copyright (C) 2000,2001 J.I. Lee <jung-ik.lee@intel.com>

include/asm-ia64/agp.h→arch/ia64/include/asm/agp.h

+0 −0

File moved.

View file