| Age | Commit message (Collapse) | Author |
|---|
|
Sloppiest merge ever. LXFB still needs to be updated, it will not build.
Conflicts:
Documentation/kernel-parameters.txt
Documentation/power/basic-pm-debugging.txt
Documentation/power/swsusp.txt
Documentation/power_supply_class.txt
Documentation/usb/persist.txt
arch/i386/Kconfig
arch/i386/kernel/Makefile
arch/i386/kernel/head.S
arch/i386/kernel/setup.c
arch/i386/pci/Makefile
arch/i386/pci/init.c
arch/i386/pci/pci.h
arch/powerpc/configs/pmac32_defconfig
block/ll_rw_blk.c
drivers/Kconfig
drivers/base/dd.c
drivers/hid/usbhid/hid-core.c
drivers/input/keyboard/atkbd.c
drivers/input/mouse/psmouse.h
drivers/media/video/cafe_ccic.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/misc/eeprom_93cx6.c
drivers/mmc/card/block.c
drivers/net/wireless/Kconfig
drivers/net/wireless/Makefile
drivers/net/wireless/hostap/hostap_ap.c
drivers/net/wireless/hostap/hostap_pci.c
drivers/net/wireless/hostap/hostap_plx.c
drivers/net/wireless/libertas/11d.c
drivers/net/wireless/libertas/11d.h
drivers/net/wireless/libertas/Makefile
drivers/net/wireless/libertas/assoc.c
drivers/net/wireless/libertas/assoc.h
drivers/net/wireless/libertas/cmd.c
drivers/net/wireless/libertas/cmdresp.c
drivers/net/wireless/libertas/debugfs.c
drivers/net/wireless/libertas/decl.h
drivers/net/wireless/libertas/defs.h
drivers/net/wireless/libertas/dev.h
drivers/net/wireless/libertas/ethtool.c
drivers/net/wireless/libertas/host.h
drivers/net/wireless/libertas/hostcmd.h
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/libertas/if_usb.c
drivers/net/wireless/libertas/if_usb.h
drivers/net/wireless/libertas/join.c
drivers/net/wireless/libertas/join.h
drivers/net/wireless/libertas/main.c
drivers/net/wireless/libertas/rx.c
drivers/net/wireless/libertas/scan.c
drivers/net/wireless/libertas/scan.h
drivers/net/wireless/libertas/tx.c
drivers/net/wireless/libertas/types.h
drivers/net/wireless/libertas/wext.c
drivers/net/wireless/libertas/wext.h
drivers/net/wireless/rtl8187.h
drivers/net/wireless/rtl8187_dev.c
drivers/net/wireless/rtl8187_rtl8225.c
drivers/net/wireless/rtl8187_rtl8225.h
drivers/net/wireless/rtl818x.h
drivers/net/wireless/zd1211rw/Makefile
drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
drivers/net/wireless/zd1211rw/zd_usb.c
drivers/power/Kconfig
drivers/power/Makefile
drivers/power/apm_power.c
drivers/power/ds2760_battery.c
drivers/power/olpc_battery.c
drivers/power/pda_power.c
drivers/power/pmu_battery.c
drivers/power/power_supply.h
drivers/power/power_supply_core.c
drivers/power/power_supply_leds.c
drivers/power/power_supply_sysfs.c
drivers/serial/serial_core.c
drivers/usb/core/Kconfig
drivers/usb/core/driver.c
drivers/usb/core/generic.c
drivers/usb/core/hcd.c
drivers/usb/core/hcd.h
drivers/usb/core/hub.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-q.c
drivers/usb/host/ohci-pci.c
drivers/usb/storage/usb.c
drivers/video/geode/Kconfig
drivers/video/geode/Makefile
drivers/video/geode/lxfb.h
drivers/video/geode/lxfb_core.c
drivers/video/geode/lxfb_ops.c
drivers/w1/slaves/w1_ds2760.c
drivers/w1/slaves/w1_ds2760.h
fs/Kconfig
include/asm-i386/setup.h
include/linux/console.h
include/linux/eeprom_93cx6.h
include/linux/i2c-id.h
include/linux/pda_power.h
include/linux/power_supply.h
include/linux/suspend.h
include/linux/usb.h
include/linux/usb/quirks.h
kernel/power/Kconfig
kernel/printk.c
kernel/time/timekeeping.c
net/mac80211/ieee80211_ioctl.c
scripts/kconfig/qconf.cc
sound/pci/ac97/ac97_codec.c
Signed-off-by: Andres Salomon <dilinger@debian.org>
|
|
This patch prepares the x86_64 architecture initialization for
paravirt. It requires a memory initialization step, which is done
by implementing 64-bit version for machine_specific_memory_setup,
and putting an ARCH_SETUP hook, for guest-dependent initialization.
This last step is done akin to i386
Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Make <asm/setup.h> usable by the boot code.
Clean up vestiges of the old command-line protocol from setup.h and
head_32.S (it is still supported from the boot loader point of
view, since it is converted to the new command-line protocol by the
boot code.)
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Move the headers to include/asm-x86 and fixup the
header install make rules
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
