David Woodhouse e758936e02 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	include/asm-x86/statfs.h

2008-10-13 17:13:56 +01:00

..

backlight.c

[POWERPC] Remove old interface find_devices

2007-04-24 22:09:02 +10:00

bootx_init.c

[POWERPC] Remove old includes from arch/ppc

2007-08-22 22:39:35 -05:00

cache.S

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

cpufreq_32.c

calibrate_delay() must be __cpuinit

2008-02-06 10:41:08 -08:00

cpufreq_64.c

[CPUFREQ] move policy's governor initialisation out of low-level drivers into cpufreq core

2007-10-04 18:40:57 -04:00

feature.c

[POWERPC] Disable G5 NAP mode during SMU commands on U3

2008-02-08 19:52:35 +11:00

Kconfig

[POWERPC] disallow building powermac and tsi108 without PCI

2007-06-29 01:57:00 -05:00

low_i2c.c

[POWERPC] powermac: Use machine_*_initcall() hooks in platform code

2008-01-17 14:57:14 +11:00

Makefile

powerpc: Work around gcc's -fno-omit-frame-pointer bug

2008-09-03 20:53:34 +10:00

nvram.c

[POWERPC] Rename device_is_compatible to of_device_is_compatible

2007-05-07 20:31:14 +10:00

pci.c

ppc/pmac: remove no longer needed IDE quirk

2008-04-18 00:46:32 +02:00

pfunc_base.c

[POWERPC] powermac: Use machine_*_initcall() hooks in platform code

2008-01-17 14:57:14 +11:00

pfunc_core.c

arch: Remove unnecessary inclusions of asm/semaphore.h

2008-04-18 22:14:49 -04:00

pic.c

[POWERPC] Move xmon_irq() declaration into xmon.h

2008-05-14 22:31:54 +10:00

pic.h

[POWERPC] Fix up after irq changes

2006-10-07 22:08:26 +10:00

pmac.h

ppc/pmac: remove ppc_ide_md hooks

2008-04-18 00:46:29 +02:00

setup.c

Remove asm/a.out.h files for all architectures without a.out support.

2008-09-06 19:30:24 +01:00

sleep.S

[POWERPC] Fix build breakage with CONFIG_PPC32

2006-10-23 18:23:17 +10:00

smp.c

powerpc: Allow create_branch() to return errors

2008-07-01 11:28:19 +10:00

time.c

[POWERPC] powermac: Fix warning in time.c

2007-12-03 13:56:25 +11:00

udbg_adb.c

[POWERPC] Fix section mismatches in udbg_adb.c

2007-08-17 11:02:06 +10:00

udbg_scc.c

powerpc/powermac: Use sane default baudrate for SCC debugging

2008-07-28 16:30:52 +10:00