Len Brown a733a5da97 Merge branches 'release' and 'fluff' into release ... Conflicts: drivers/acpi/scan.c include/linux/acpi.h Signed-off-by: Len Brown <len.brown@intel.com>		2008-02-07 03:38:22 -05:00
..
alpha	calibrate_delay() must be __cpuinit	2008-02-06 10:41:08 -08:00
arm	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2008-02-06 10:47:46 -08:00
avr32	read_current_timer() cleanups	2008-02-06 10:41:02 -08:00
blackfin	Rename: linux/pata_platform.h to linux/ata_platform.h	2008-02-06 06:54:17 -05:00
cris	arch/cris: add a missing iounmap	2008-02-05 09:44:24 -08:00
frv	calibrate_delay() must be __cpuinit	2008-02-06 10:41:08 -08:00
h8300	proper show_interrupts() prototype	2008-02-06 10:41:02 -08:00
ia64	Merge branches 'release' and 'fluff' into release	2008-02-07 03:38:22 -05:00
m32r	timerfd: fix remaining architectures	2008-02-05 14:37:15 -08:00
m68k	cleanup after APUS removal	2008-02-06 10:41:01 -08:00
m68knommu	Remove inclusions of <linux/autoconf.h>	2008-02-06 10:41:00 -08:00
mips	calibrate_delay() must be __cpuinit	2008-02-06 10:41:08 -08:00
parisc	alpha/parisc: remove config variable DEBUG_RWLOCK	2008-02-06 10:41:03 -08:00
powerpc	calibrate_delay() must be __cpuinit	2008-02-06 10:41:08 -08:00
ppc	scheduled OSS driver removal	2008-02-06 10:41:02 -08:00
s390	Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6	2008-02-05 10:11:02 -08:00
sh	Rename: linux/pata_platform.h to linux/ata_platform.h	2008-02-06 06:54:17 -05:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2008-02-06 10:46:58 -08:00
sparc64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2008-02-06 10:46:58 -08:00
um	uml: make mconsole_stack namespace-aware	2008-02-05 09:44:32 -08:00
v850
x86	Merge branches 'release' and 'fluff' into release	2008-02-07 03:38:22 -05:00
xtensa	calibrate_delay() must be __cpuinit	2008-02-06 10:41:08 -08:00
.gitignore
Kconfig