Len Brown 26b6f22366 Merge branches 'release' and 'menlo' into release ...

Conflicts:

	drivers/acpi/video.c

Signed-off-by: Len Brown <len.brown@intel.com>

2008-02-07 03:18:04 -05:00

..

acorn/char

…

acpi

Merge branches 'release' and 'menlo' into release

2008-02-07 03:18:04 -05:00

amba

…

ata

ata_piix.c:piix_init_one() must be __devinit

2008-02-06 07:01:56 -05:00

atm

…

auxdisplay

…

base

register_cpu __devinit or __cpuinit

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

block

Atari floppy: Rename disk_type to atari_disk_type

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

bluetooth

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

2008-02-05 10:09:07 -08:00

cdrom

drivers/cdrom/cdrom.c: simplify logic in cdrom_release()

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

char

ip27-rtc: convert ioctl to unlocked_ioctl

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

clocksource

…

connector

…

cpufreq

…

cpuidle

Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release

2008-02-07 03:11:05 -05:00

crypto

…

dca

…

dio

dio: ARRAY_SIZE() cleanup

2008-02-05 09:44:23 -08:00

dma

async_tx: replace 'int_en' with operation preparation flags

2008-02-06 10:12:18 -07:00

edac

drivers/edac/: Spelling fixes

2008-02-03 17:12:34 +02:00

eisa

…

firewire

firewire: fw-sbp2: Use sbp2 device-provided mgt orb timeout for logins

2008-01-30 22:22:29 +01:00

firmware

Merge branches 'release' and 'dmi' into release

2008-02-07 03:11:31 -05:00

gpio

gpio: handle pca953{4,5,6,7,8} too

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

hid

…

hwmon

…

i2c

deprecate obsolete pca9539 driver

2008-02-05 09:44:13 -08:00

ide

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

ieee1394

ieee1394: sbp2: fix bogus s/g access change

2008-02-02 13:48:16 +01:00

infiniband

RDMA/nes: Add a driver for NetEffect RNICs

2008-02-04 20:20:45 -08:00

input

Remove pointless casts from void pointers

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

isdn

drivers/isdn/hardware/eicon/debug.c: fix uninitialized var warning

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

leds

leds: add possibility to remove leds classdevs during suspend/resume

2008-02-05 09:44:23 -08:00

lguest

virtio: reset function

2008-02-04 23:50:03 +11:00

macintosh

ppc: fix #ifdef-s in mediabay driver (take 2)

2008-02-06 02:57:50 +01:00

mca

…

md

md: fix an occasional deadlock in raid5

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

media

scheduled OSS driver removal

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

message

drivers/message/: Spelling fixes

2008-02-03 17:21:01 +02:00

mfd

…

misc

Merge branches 'release' and 'menlo' into release

2008-02-07 03:18:04 -05:00

mmc

…

mtd

Claim maintainership for block2mtd and update email addresses

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

net

Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

2008-02-06 03:52:44 -08:00

nubus

nubus: kill drivers/nubus/nubus_syms.c

2008-02-05 09:44:23 -08:00

of

…

oprofile

…

parisc

iommu sg merging: parisc: make iommu respect the segment size limits

2008-02-05 09:44:10 -08:00

parport

parport_pc: detection for SuperIO IT87XX POST

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

pci

Genericizing iova.[ch]

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

pcmcia

drivers/pcmcia: add missing pci_dev_get

2008-02-05 09:44:09 -08:00

pnp

Merge branches 'release', 'bugzilla-6217', 'bugzilla-6629', 'bugzilla-6933', 'bugzilla-7186', 'bugzilla-8269', 'bugzilla-8570', 'bugzilla-9139', 'bugzilla-9277', 'bugzilla-9341', 'bugzilla-9444', 'bugzilla-9614', 'bugzilla-9643' and 'bugzilla-9644' into release

2008-02-07 03:09:43 -05:00

power

ACPI: battery: add sysfs serial number

2008-02-05 21:15:50 -05:00

ps3

ps3: use symbolic names for video modes

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

rapidio

Merge branch 'linux-2.6'

2008-01-31 11:25:51 +11:00

rtc

rtc: at91sam9 RTC support (RTT and/or RTC)

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

s390

calibrate_delay() must be __cpuinit

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

sbus

…

scsi

scsi: megaraid: trivial drop duplicate mutex.h include

2008-02-06 11:15:41 -08:00

serial

SC26XX: New serial driver for SC2681 uarts

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

sh

…

sn

…

spi

spi: remove more dev->power.power_state usage

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

ssb

drivers/ssb/: Spelling fixes

2008-02-03 17:30:25 +02:00

tc

…

telephony

…

thermal

the generic thermal sysfs driver

2008-02-01 23:12:19 -05:00

uio

uio: nopage

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

usb

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

2008-02-02 14:29:33 +11:00

video

fb: fix warning: no return statement in function returning non-void

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

virtio

virtio: add missing #include <linux/delay.h>

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

w1

w1-gpio: add GPIO w1 bus master driver

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

watchdog

drivers/watchdog/: Spelling fixes

2008-02-03 17:32:52 +02:00

xen

…

zorro

…

Kconfig

Merge branches 'release' and 'menlo' into release

2008-02-07 03:18:04 -05:00

Makefile

Merge branches 'release' and 'menlo' into release

2008-02-07 03:18:04 -05:00