Jiri Kosina fb8231a8b1 Merge branch 'master' into for-next ... Conflicts: arch/arm/mach-omap1/board-nokia770.c		2010-08-10 13:22:08 +02:00
..
boot	xtensa: move headers files to arch/xtensa/include	2008-11-06 10:25:09 -08:00
configs	xtensa: Disable PCI and nfsroot on simulation target	2010-08-03 00:18:38 -07:00
include/asm	Merge branch 'master' into for-next	2010-08-10 13:22:08 +02:00
kernel	Merge remote branch 'origin/master'	2010-08-03 00:38:00 -07:00
lib	xtensa: move headers files to arch/xtensa/include	2008-11-06 10:25:09 -08:00
mm	xtensa: invoke oom-killer from page fault	2010-06-04 15:21:44 -07:00
platforms	xtensa: Fix the network driver for the simulator target	2010-05-02 08:37:20 -07:00
variants	xtensa: support s6000 gpio irqs and alternate function selection	2009-06-22 02:37:26 -07:00
Kconfig	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
Kconfig.debug
Makefile	xtensa: Add -mforce-no-pic option is supported	2010-05-02 01:00:22 -07:00