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/native/inst.h * arch/ia64/include/asm/native/inst.h
* *
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K. * VA Linux Systems Japan K.K.
......
/****************************************************************************** /******************************************************************************
* include/asm-ia64/native/irq.h * arch/ia64/include/asm/native/irq.h
* *
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K. * VA Linux Systems Japan K.K.
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* moved from linux/include/asm-ia64/irq.h.
*/ */
#ifndef _ASM_IA64_NATIVE_IRQ_H #ifndef _ASM_IA64_NATIVE_IRQ_H
......
/****************************************************************************** /******************************************************************************
* include/asm-ia64/paravirt.h
*
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K. * VA Linux Systems Japan K.K.
* *
......
/****************************************************************************** /******************************************************************************
* include/asm-ia64/paravirt_privops.h
*
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K. * VA Linux Systems Japan K.K.
* *
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment