John W. Linville c0ddd04d55 wireless: cleanup some merge errors ...

Signed-off-by: John W. Linville <linville@tuxdriver.com>

2008-01-28 15:08:45 -08:00

..

acorn/char

…

acpi

…

amba

…

ata

libata: Change "write_data" to "rw" for some function documentations

2008-01-29 08:48:17 +11:00

atm

[ATM]: [he] fixing compilation when you define USE_RBPS_POOL/USE_RBPL_POOL

2008-01-28 15:00:15 -08:00

auxdisplay

…

base

…

block

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

2008-01-29 08:52:50 +11:00

bluetooth

…

cdrom

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

2008-01-29 08:52:50 +11:00

char

…

clocksource

…

connector

[NETNS]: Consolidate kernel netlink socket destruction.

2008-01-28 15:08:07 -08:00

cpufreq

…

cpuidle

…

crypto

…

dca

…

dio

…

dma

…

edac

…

eisa

…

firewire

…

firmware

…

hid

HID: ADS/Tech Radio si470x needs blacklist entry

2008-01-28 14:51:23 +01:00

hwmon

…

i2c

Merge branch 'orion' into devel

2008-01-28 13:21:30 +00:00

ide

blk_end_request: changing ide-cd (take 4)

2008-01-28 10:37:06 +01:00

ieee1394

…

infiniband

[IPV4] drivers/infiniband: Use ipv4_is_<type>

2008-01-28 14:58:17 -08:00

input

[ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix

2008-01-28 13:13:25 +00:00

isdn

…

kvm

…

leds

…

lguest

…

macintosh

i2c: Kill rogue driver IDs

2008-01-27 18:14:47 +01:00

mca

…

md

…

media

i2c: Drivers stop using the redundant client list

2008-01-27 18:14:51 +01:00

message

blk_end_request: changing i2o_block (take 4)

2008-01-28 10:36:50 +01:00

mfd

[ARM] Fix class_device damage caused by 0c55445f20

2008-01-28 10:59:09 +00:00

misc

…

mmc

Merge branch 'blk-end-request' of git://git.kernel.dk/linux-2.6-block

2008-01-29 08:51:32 +11:00

mtd

…

net

wireless: cleanup some merge errors

2008-01-28 15:08:45 -08:00

nubus

…

of

…

oprofile

…

parisc

[PARISC]: Fix build after ipv4_is_*() changes.

2008-01-28 14:58:20 -08:00

parport

…

pci

…

pcmcia

…

pnp

…

power

…

ps3

…

rapidio

…

rtc

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

2008-01-29 08:52:50 +11:00

s390

[VLAN]: Turn VLAN_DEV_INFO into inline function

2008-01-28 15:08:32 -08:00

sbus

…

scsi

[NETNS]: Consolidate kernel netlink socket destruction.

2008-01-28 15:08:07 -08:00

serial

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

2008-01-29 08:52:50 +11:00

sh

…

sn

…

spi

…

ssb

ssb: Remove the old, now unused, data structures

2008-01-28 15:04:44 -08:00

tc

…

telephony

…

uio

…

usb

Merge branch 'pxa-plat' into devel

2008-01-28 13:21:38 +00:00

video

Merge branches 'at91', 'ep93xx', 'iop', 'kprobes', 'ks8695', 'misc', 'msm', 's3c2410', 'sa1100' and 'vfp' into devel

2008-01-28 13:21:21 +00:00

virtio

…

w1

i2c: normal_i2c can be made const (remaining drivers)

2008-01-27 18:14:47 +01:00

watchdog

…

xen

…

zorro

…

Kconfig

…

Makefile

…