John W. Linville 4bdb0fba9e rt61pci: fix-up merge damage ...

A subtle merge error was introduced after re-queueing a patch for 2.6.24
instead of 2.6.25...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2008-01-31 19:26:33 -08:00

..

acorn/char

…

acpi

…

amba

…

ata

Merge branch 'linux-2.6'

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

atm

…

auxdisplay

…

base

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

2008-01-31 09:31:37 +11:00

block

…

bluetooth

…

cdrom

…

char

Merge branch 'linux-2.6'

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

clocksource

…

connector

…

cpufreq

…

cpuidle

…

crypto

…

dca

…

dio

…

dma

…

edac

Merge branch 'linux-2.6'

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

eisa

…

firewire

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

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

firmware

…

hid

…

hwmon

…

i2c

…

ide

…

ieee1394

ieee1394: ohci1394: don't schedule IT tasklets on IR events

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

infiniband

[SCSI] remove use_sg_chaining

2008-01-30 13:14:02 -06:00

input

[ALSA] Remove sound/driver.h

2008-01-31 17:29:48 +01:00

isdn

…

leds

…

lguest

lguest: fix mis-merge against hpa's TSS renaming

2008-01-31 19:59:44 +11:00

macintosh

Merge branch 'linux-2.6'

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

mca

…

md

…

media

[ALSA] Remove sound/driver.h

2008-01-31 17:29:48 +01:00

message

…

mfd

…

misc

…

mmc

…

mtd

…

net

rt61pci: fix-up merge damage

2008-01-31 19:26:33 -08:00

nubus

…

of

…

oprofile

…

parisc

…

parport

…

pci

Merge branch 'linux-2.6'

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

pcmcia

…

pnp

…

power

…

ps3

…

rapidio

Merge branch 'linux-2.6'

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

rtc

…

s390

[SCSI] zfcp: fix sense_buffer access bug

2008-01-30 13:03:39 -06:00

sbus

…

scsi

[SCSI] Revert "[SCSI] aacraid: fib context lock for management ioctls"

2008-01-30 13:14:26 -06:00

serial

Merge branch 'linux-2.6'

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

sh

…

sn

…

spi

Merge branch 'linux-2.6'

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

ssb

…

tc

…

telephony

…

uio

…

usb

[ALSA] Remove sound/driver.h

2008-01-31 17:29:48 +01:00

video

…

virtio

…

w1

…

watchdog

…

xen

…

zorro

…

Kconfig

KVM: Move arch dependent files to new directory arch/x86/kvm/

2008-01-30 18:01:18 +02:00

Makefile

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

2008-01-31 09:35:32 +11:00