John W. Linville ddd21046e7 iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage ...

I may have botched my merge conflict resolution instructions for Dave...

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

2009-11-11 13:04:42 -08:00

..

accessibility

…

acpi

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

2009-10-04 15:03:00 -07:00

amba

…

ata

trivial: fix comment typo in drivers/ata/pata_hpt37x.c

2009-09-21 15:15:53 +02:00

atm

ambassador: declare MODULE_FIRMWARE

2009-11-10 20:28:49 -08:00

auxdisplay

…

base

mm: oom analysis: add shmem vmstat

2009-09-22 07:17:27 -07:00

block

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

2009-10-04 12:39:14 -07:00

bluetooth

…

cdrom

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

char

headers: remove sched.h from poll.h

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

clocksource

…

connector

connector: Fix incompatible pointer type warning

2009-10-06 01:39:51 -07:00

cpufreq

…

cpuidle

cpuidle: menu governor: reduce latency on exit

2009-09-22 07:17:45 -07:00

crypto

…

dca

…

dio

…

dma

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

2009-09-23 18:31:11 +10:00

edac

edac: core: remove completion-wait for complete with rcu_barrier

2009-09-24 07:21:05 -07:00

eisa

…

firewire

headers: remove sched.h from poll.h

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

firmware

mm: don't use alloc_bootmem_low() where not strictly needed

2009-09-22 07:17:38 -07:00

gpio

const: constify remaining file_operations

2009-10-01 16:11:11 -07:00

gpu

Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2009-09-30 08:03:00 -07:00

hid

headers: remove sched.h from poll.h

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

hwmon

ltc4215/ltc4245: Discard obsolete detect methods

2009-10-04 22:53:42 +02:00

i2c

i2c: Hide probe errors caused by ACPI resource conflicts

2009-10-04 22:53:45 +02:00

ide

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

2009-09-23 09:32:11 -07:00

idle

…

ieee1394

const: mark struct vm_struct_operations

2009-09-27 11:39:25 -07:00

ieee802154

fakehard: mlme_ops->get_phy implementation

2009-11-06 14:32:20 +03:00

infiniband

net: Convert ethtool {get_stats, self_test}_count() ops to get_sset_count()

2009-10-05 00:10:10 -07:00

input

headers: remove sched.h from poll.h

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

isdn

speedfax: declare MODULE_FIRMWARE

2009-11-10 20:30:37 -08:00

leds

leds: leds-pca9532 - Drop unused module parameters

2009-10-04 22:53:43 +02:00

lguest

const: constify remaining file_operations

2009-10-01 16:11:11 -07:00

macintosh

macintosh: Don't assume i2c device probing always succeeds

2009-10-04 22:53:46 +02:00

mca

…

md

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

2009-10-04 12:39:14 -07:00

media

headers: remove sched.h from poll.h

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

memstick

memstick: move dev_dbg

2009-09-24 07:21:05 -07:00

message

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

2009-09-22 07:51:45 -07:00

mfd

headers: remove sched.h from poll.h

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

misc

iwmc3200top: Add Intel Wireless MultiCom 3200 top driver.

2009-10-19 23:22:50 -07:00

mmc

Merge master.kernel.org:/home/rmk/linux-2.6-arm

2009-10-02 16:20:43 -07:00

mtd

block: use normal I/O path for discard requests

2009-10-01 21:19:30 +02:00

net

iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage

2009-11-11 13:04:42 -08:00

nubus

…

of

of: remove "stm,m25p40" alias

2009-09-23 07:39:43 -07:00

oprofile

cpumask: use zalloc_cpumask_var() where possible

2009-09-24 09:34:24 +09:30

parisc

parisc: led: Use for_each_netdev_rcu()

2009-11-10 20:54:43 -08:00

parport

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

pci

ACPICA: fixup after acpi_get_object_info() change

2009-09-25 14:24:22 -04:00

pcmcia

Merge master.kernel.org:/home/rmk/linux-2.6-arm

2009-10-02 16:20:43 -07:00

platform

Merge branches 'sony-laptop', 'bugzilla-14247' and 'bugzilla-14271' into release

2009-10-02 11:27:57 -04:00

pnp

ACPI: remove acpi_device.flags.hardware_id

2009-09-25 15:09:48 -04:00

power

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-09-23 03:49:27 +04:00

pps

…

ps3

…

rapidio

…

regulator

regulator: fix voltage range in da9034 ldo12

2009-09-22 13:58:23 +01:00

rtc

Merge branch 'origin' into for-linus

2009-09-24 21:22:33 +01:00

s390

ctcm rollback in case of errors

2009-10-17 23:57:24 -07:00

sbus

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

scsi

const: constify remaining file_operations

2009-10-01 16:11:11 -07:00

serial

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

2009-11-06 00:55:55 -08:00

sfi

SFI: remove __init from sfi_verify_table

2009-10-03 01:16:12 -04:00

sh

…

sn

…

spi

spi-imx: strip down chipselect function to only drive the chipselect

2009-10-01 16:11:17 -07:00

ssb

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

2009-11-11 11:38:16 -08:00

staging

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2009-11-09 11:17:24 -08:00

tc

…

telephony

…

thermal

…

uio

const: mark struct vm_struct_operations

2009-09-27 11:39:25 -07:00

usb

headers: remove sched.h from poll.h

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

uwb

const: constify remaining file_operations

2009-10-01 16:11:11 -07:00

video

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

2009-10-02 13:37:18 -07:00

virtio

virtio: add virtio IDs file

2009-09-23 22:26:32 +09:30

vlynq

drivers/vlynq/vlynq.c: fix resource size off by 1 error

2009-09-24 07:21:05 -07:00

w1

ds2482: Discard obsolete detect method

2009-10-04 22:53:41 +02:00

watchdog

[WATCHDOG] Add support for the Avionic Design Xanthos watchdog timer.

2009-09-25 08:38:16 +00:00

xen

headers: remove sched.h from poll.h

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

zorro

…

Kconfig

…

Makefile

Merge git://git.infradead.org/mtd-2.6

2009-09-23 10:07:49 -07:00