AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
368e2119c3
kernel_optimize_test/arch/powerpc
History
Linus Torvalds d10902812c Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits)
  x86: Clean up apic.c and apic.h
  x86: Remove superflous goal definition of tsc_sync
  x86: dt: Correct local apic documentation in device tree bindings
  x86: dt: Cleanup local apic setup
  x86: dt: Fix OLPC=y/INTEL_CE=n build
  rtc: cmos: Add OF bindings
  x86: ce4100: Use OF to setup devices
  x86: ioapic: Add OF bindings for IO_APIC
  x86: dtb: Add generic bus probe
  x86: dtb: Add support for PCI devices backed by dtb nodes
  x86: dtb: Add device tree support for HPET
  x86: dtb: Add early parsing of IO_APIC
  x86: dtb: Add irq domain abstraction
  x86: dtb: Add a device tree for CE4100
  x86: Add device tree support
  x86: e820: Remove conditional early mapping in parse_e820_ext
  x86: OLPC: Make OLPC=n build again
  x86: OLPC: Remove extra OLPC_OPENFIRMWARE_DT indirection
  x86: OLPC: Cleanup config maze completely
  x86: OLPC: Hide OLPC_OPENFIRMWARE config switch
  ...

Fix up conflicts in arch/x86/platform/ce4100/ce4100.c
2011-03-15 20:01:36 -07:00
..
boot powerpc/boot/dts: Install dts from the right directory 2011-01-21 14:08:38 +11:00
configs Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-01-21 13:23:52 -08:00
include/asm Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-03-15 20:01:36 -07:00
kernel Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-03-15 20:01:36 -07:00
kvm KVM: Clean up vm creation and release 2011-01-12 11:29:09 +02:00
lib powerpc: Ensure the else case of feature sections will fit 2011-01-21 14:08:33 +11:00
math-emu powerpc/Makefiles: Change to new flag variables 2010-10-13 16:19:22 +11:00
mm powerpc/pseries: Disable VPNH feature 2011-03-10 10:06:41 +11:00
oprofile tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
platforms kill path_lookup() 2011-03-14 09:15:23 -04:00
sysdev powerpc/mpic: Fix mask/unmask timeout message 2011-01-21 14:08:39 +11:00
xmon powerpc/Makefiles: Change to new flag variables 2010-10-13 16:19:22 +11:00
Kconfig powerpc: Use generic irq Kconfig 2011-01-21 11:55:33 +01:00
Kconfig.debug
Makefile powerpc: Fix typo in uImage target 2010-08-24 15:26:32 +10:00
relocs_check.pl