Ingo Molnar f541ae326f Merge branch 'linus' into perfcounters/core-v2 ...

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
	arch/powerpc/kernel/Makefile
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/hardirq.h
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/irq.c
	arch/x86/kernel/syscall_table_32.S
	arch/x86/mm/iomap_32.c
	include/linux/sched.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-04-06 09:02:57 +02:00

..

accessibility

…

acpi

Merge branch 'linus' into perfcounters/core-v2

2009-04-06 09:02:57 +02:00

amba

amba: struct device - replace bus_id with dev_name(), dev_set_name()

2009-03-24 16:38:22 -07:00

ata

trivial: fix typos/grammar errors in Kconfig texts

2009-03-30 15:22:01 +02:00

atm

atm: fix non-const printk argument

2009-03-21 19:06:51 -07:00

auxdisplay

auxdisplay: remove PARPORT dependency

2009-04-01 08:59:17 -07:00

base

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask

2009-04-05 10:33:07 -07:00

block

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/linux-hdreg-h-cleanup

2009-04-03 09:02:32 -07:00

bluetooth

…

cdrom

…

char

Merge branch 'linus' into perfcounters/core-v2

2009-04-06 09:02:57 +02:00

clocksource

clocksource: sh_cmt: use remove_irq() and remove clockevent workaround

2009-04-02 11:18:48 +09:00

connector

…

cpufreq

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

2009-03-26 11:04:08 -07:00

cpuidle

…

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2009-04-03 09:45:53 -07:00

dca

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2009-03-23 09:25:58 -07:00

dio

dio: struct device - replace bus_id with dev_name(), dev_set_name()

2009-03-24 16:38:22 -07:00

dma

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

2009-04-03 12:13:45 -07:00

edac

edac: AMD8111 driver Kconfig & Makefile

2009-04-02 19:05:04 -07:00

eisa

Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

2009-03-27 17:28:43 +01:00

firewire

firewire: core: optimize propagation of BROADCAST_CHANNEL

2009-03-24 20:56:52 +01:00

firmware

dmi: Let dmi_walk() users pass private data

2009-03-30 21:46:44 +02:00

gpio

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-04-03 15:24:35 -07:00

gpu

Merge branch 'linus' into release

2009-04-05 02:14:15 -04:00

hid

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

2009-04-03 15:25:44 -07:00

hwmon

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-04-03 15:24:35 -07:00

i2c

Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

2009-03-30 17:54:32 -07:00

ide

ide-floppy: do not complete rq's prematurely

2009-03-31 20:15:34 +02:00

idle

…

ieee1394

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

2009-03-27 18:33:56 -07:00

infiniband

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2009-03-28 13:30:43 -07:00

input

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2009-04-05 11:15:54 -07:00

isdn

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-04-03 15:24:35 -07:00

leds

trivial: Update my email address

2009-03-30 15:22:04 +02:00

lguest

lguest: use bool instead of int

2009-03-30 21:55:25 +10:30

macintosh

…

mca

mca: struct device - replace bus_id with dev_name(), dev_set_name()

2009-03-24 16:38:23 -07:00

md

Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

2009-04-03 10:02:45 -07:00

media

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-04-03 15:24:35 -07:00

memstick

…

message

proc 2/2: remove struct proc_dir_entry::owner

2009-03-31 01:14:44 +04:00

mfd

mfd: fix da903x warning

2009-04-05 00:32:25 +02:00

misc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-04-03 15:24:35 -07:00

mmc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

2009-04-05 10:18:21 -07:00

mtd

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param

2009-04-05 10:30:21 -07:00

net

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-04-03 15:24:35 -07:00

nubus

…

of

powerpc: add mmc-spi-slot bindings

2009-04-01 08:59:23 -07:00

oprofile

Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 11:04:19 -07:00

parisc

parisc: drivers: fix warnings

2009-04-02 00:40:41 +00:00

parport

parport: netmos 9845 & 9855 1P4S fixes

2009-04-02 19:05:04 -07:00

pci

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2009-04-05 11:16:25 -07:00

pcmcia

[ARM] 5442/1: pxa/cm-x255: fix reverse RDY gpios in PCMCIA driver

2009-04-02 11:02:32 +01:00

platform

Merge branch 'linus' into release

2009-04-05 02:14:15 -04:00

pnp

Merge branch 'linus' into release

2009-04-05 02:14:15 -04:00

power

Merge branch 'linus' into release

2009-04-05 02:14:15 -04:00

ps3

…

rapidio

rapidio: struct device - replace bus_id with dev_name(), dev_set_name()

2009-03-24 16:38:21 -07:00

regulator

regulator: twl4030 VAUX3 supports 3.0V

2009-03-31 11:29:54 +01:00

rtc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2009-04-05 11:15:54 -07:00

s390

workqueue: add to_delayed_work() helper function

2009-04-02 19:04:50 -07:00

sbus

…

scsi

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-04-03 15:24:35 -07:00

serial

Merge branch 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

2009-04-05 11:15:28 -07:00

sh

sh: intc: set_irq_wake() support

2009-04-02 11:19:57 +09:00

sn

…

spi

spi-gpio: allow operation without CS signal

2009-04-02 19:04:51 -07:00

ssb

b43: Add BCM4307 PCI-ID

2009-03-27 20:13:20 -04:00

staging

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2009-04-05 11:06:45 -07:00

tc

tc: struct device - replace bus_id with dev_name(), dev_set_name()

2009-03-24 16:38:22 -07:00

telephony

…

thermal

thermal: support forcing support for passive cooling

2009-03-27 16:58:22 -04:00

uio

UIO: Take offset into account when determining number of pages that can be mapped

2009-03-24 16:38:25 -07:00

usb

Merge branch 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

2009-04-05 11:15:28 -07:00

uwb

trivial: fix typos/grammar errors in Kconfig texts

2009-03-30 15:22:01 +02:00

video

fb: nvidiafb recognizes geforcego 7300 chip as mobile

2009-04-02 19:04:48 -07:00

virtio

virtio: more neatening of virtio_ring macros.

2009-03-30 21:55:23 +10:30

w1

mfd: remove DS1WM clock handling

2009-04-05 00:32:22 +02:00

watchdog

Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

2009-03-30 17:54:32 -07:00

xen

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask

2009-04-05 10:33:07 -07:00

zorro

zorro: struct device - replace bus_id with dev_name(), dev_set_name()

2009-03-24 16:38:21 -07:00

Kconfig

…

Makefile

ide/net: flip the order of SATA and network init

2009-03-28 13:06:16 -07:00